cherry-pick 20109353: Revert Remove AOSP support. Do not merge.

Change-Id: I1680a645324ee546407b98d40fd5e8766f099c0e
26 files changed