Merge cherrypicks of [3094267, 3095329, 3095257, 3095367] into pi-release

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