Merge 10952656

Merged-In: I19919ca8074ab200d31debc091a8f196e8018e6e
Change-Id: Ib26cc2b0b74306bb48f4347db5f7c4548f08a9c9
tree: bbe2dd30aa374573ea17b178edcb990af1c93c2d
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. OWNERS
  7. proguard.flags