Snap for 4509671 from 395f79d2cf35f16b12ee0556a10432eee9e00c3e to pi-release

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