Merge 03df8cbb557e14737e0e80eacb81a911ec4e9f23 on remote branch

Change-Id: I261dfa60c307e416cd0c663fc4319a6353139072
tree: 01f2a12f9edafc0c24fab9c5805fb8930e7999d4
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS
  6. PREUPLOAD.cfg