Merge 32b9a16915fe9e7910651bf2a48e0649ca07fb90 on remote branch

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