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

Change-Id: I599d2dd4a364d5e023112569446995792a015512
25 files changed