Snap for 4677756 from 4db4661c51d6c6a260faf6fb44367676a4c6d4e5 to pi-release

Change-Id: I57b6108bd261ed5a5748635627f0823abaa24872
tree: df35d3ca87ba97dff28428db9e093f53cf86ca37
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. proguard.flags