Merge af02a4db821e6354cb794f18e3622bcae00e7e3b on remote branch

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