Snap for 4509671 from ef814aa2329f69d83af0e22bf0c542448e4feac1 to pi-release

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