Merge b149925a736d21e0732f8b4ae6b06a30a50808cf on remote branch

Change-Id: Id2ee3c0ff0abb61f345975968cc4a8a25b8bfc70
tree: b1307a50a385eeabda52ec420d1ddc2a2855630c
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. PREUPLOAD.cfg