Merge "cherry-pick 3d9e6a99: Revert Remove AOSP support. Do not merge." into klp-dev