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

Change-Id: I23ad2af1edf05014978c3b1a099644c3ee1ecbee
tree: 441d3274f4c48975c16f8f6e32ef53c2b66eb258
  1. Android.bp
  2. AndroidManifest.xml
  3. OWNERS
  4. proto/
  5. res/
  6. src/