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

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