Snap for 4638586 from afea4255f5c2392b68953d2cd786664717e49d6b to pi-release

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