Snap for 4722539 from c5143a1784ab3a23618ed7e4500660fec892a1c1 to pi-release

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