Snap for 4407698 from 5aff865629e92af997cc0429df1c4b258b1527a5 to pi-release

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