Merge 36ab3c25edcddae884e5c1a14676a9cf328baebb on remote branch

Change-Id: Ieb80043f8ab2a9866dbb306b6a8f5234396a663a
tree: 8827cd7b31f29de0427daef8f27c1f3ccc388926
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS