Snap for 4725392 from dfcd13dbed3a5cdade28d2512515408eeae56f4b to pi-release

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