Merge 11703bf9d301ab930a02da2e572f41f00d9c337b on remote branch

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