Snap for 4710485 from 3205f8a01f5afc38b706208b9c33210d3a5524d0 to pi-release

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