Merge a1d2f6bcf5fb5f650882a657072461e8f1c98c5d on remote branch

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