Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 09bd54bc60 am: af16d33cf9

Change-Id: I7a1e6fb2ab59188c838e516703ca0926e9bafcba
tree: 610e1b1a935d1573bc418577546713ee1fa87b24
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg