Merge commit 'ef06fd1ef03fdaccd91e58e63b1bc5af37c4c6d6' into manual_merge_ef06fd1

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