Snap for 4551672 from c12698ef3ce68bbf74cefb30f4ac835c192d1377 to pi-release

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