Merge "Allow adbd and shell to read /proc/config.gz" into oc-dev