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

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