Snap for 4693621 from 2f96712464cb2f9601c941140ba71389d3f99024 to pi-release

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