Merge "Merge stage-aosp-master to aosp-master - DO NOT MERGE" am: 3996832dee am: 6596032dc3

Change-Id: I4ae04a91e31c3a0549b48a248fcf96289e7eaf96
tree: 847bde34e76017e6a90cf2107c287761e502f7e0
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. OWNERS