Merge "Revert "Use more shared libraries in adb and init."" into stage-aosp-master