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

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