Merge 50c3bef9e6bfcf366ba1f9537fcdb0b5ac276185 on remote branch

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