Merge 388a02b4d86b232a5068548a29bc53a39854cdee on remote branch

Change-Id: If83121793b2011642fc71d0212f1f205a573b345
tree: 936e0d5fd86cb99969d5911c7f53f17e7a2e73cb
  1. res/
  2. src/
  3. tests/
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. PREUPLOAD.cfg