Snap for 4402171 from f91cb738cdc8d03c4bd750fe74bb4edfd00aa95d to pi-release

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