Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 2c0d6f6e66 am: 35307da16c

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