Merge 71c423c09ecb7bd6db94fe636afee7588ac8047f on remote branch

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