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

Change-Id: Ie8fe127c7246069d43380a0c215f589531bf1018
tree: a6cc1d43625c67658378bbf1d8a899bb7baed8fa
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. src/
  6. tests/