Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 119d567a09 am: ad63d19fb5

Change-Id: Ib592859314b0ea526bc46563850dd18168cb0fec
tree: 0d1eca862407c5b487de0bde5f2bf4969a80129d
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS