Snap for 4716599 from 2ad845495be500f1bf9c09a396467f406d5da9da to pi-release

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