Merge 16103dc96adbc9aa408920e3190dcb55da07824b on remote branch

Change-Id: Id12fad6f860249a5723e4902795657e6c685a214
tree: 292d65e6ed0889c1829b4341fa8ed271e097bb57
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg