Snap for 4722539 from 39387e0806d01296295d1313892556ac8f44c240 to pi-release

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