Merge 5e714211c4ff3da371898bf6bbd341ab844d2cb8 on remote branch

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