Merge 7d4a16c0dec1512c259490f8958f8da4c0ca4711 on remote branch

Change-Id: I2c574774212aaacb09b25fb908c62b43f2f732c7
tree: 92d1da2ac1b7f6455cd06220e46c184515f33fdb
  1. assets/
  2. res/
  3. src/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml
  7. proguard.flags