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

Change-Id: I5f5b938b2ac8d9202b32c92f6f8315e010079d9a
tree: 3bae61dee3b0a605b6135cd39527730b2236b0ee
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. res/
  5. src/