Snap for 4496165 from bad2a87b3c2e8812f2a2ba395054cd533483f506 to pi-release

Change-Id: I4ae6e131d1c28ea770d81eb6ac906f2e0beb1cfa
tree: a175d19a67ecc3126636a1af0fb6efef97687e32
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags