Merge cadb54c5e3093e43936652e3ff320f77e442363f on remote branch

Change-Id: Ia7e731d7c16e54abbe52a6d23fc8f67b7fc02f34
tree: 99a74651440e8073e977a0e4c9efa32777f1856d
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS