Snap for 4545621 from f7b09ce3b698818aa666049cb2a45d340841355e to pi-release

Change-Id: I3747d7513edd4a29d1d1c31d54c81efc7e2bab87
tree: 146fc1644505b7311a24f562a4d70bc051fc14a2
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml
  6. proguard.flags