Merge bd777f36c7b9af53c3f5bde965b065d934fe1ef9 on remote branch

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