Merge stage-aosp-master to aosp-master - DO NOT MERGE

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