Merge 79d6d568e78c771a38afd926fac20499ef573beb on remote branch

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