Snap for 4670666 from 77acd9ab2539fe4a4a6ed731bdb15459e7b156b5 to pi-release

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