Snap for 4623514 from 3f5cab9ac36db4fd44996f0bcd0daf5113c409e1 to pi-release

Change-Id: I8a88ee356c581683caddabf63f45d3e3db068380
tree: 1860ce427ede321540944423eeaaf2bd3e5013e6
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. OWNERS
  6. proguard.flags