Snap for 4384511 from 8ffa89d42a5eb7f7f084c8de422a82e7aa95d74c to pi-release

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