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

Change-Id: If6fbfad52a3378400cb2006671a961c7413d317c
tree: 3588880a2c8c62f0847cf0003cbb948494548c17
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. PREUPLOAD.cfg
  5. res/
  6. src/
  7. tests/