Snap for 4623514 from 2a42662968a56aa497e5e890ce598c3e350a4f7b to pi-release

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