Merge changes Idb3f486e,I534e1d22 am: 38e05b7d25 am: 7c932042b6
am: 88ec915c90

Change-Id: Ibed651fae352ea185be7a34f6e8017bf3ed5b392
tree: db880f8d93f889253dc9cbdd3253ce7bfdc84ceb
  1. assets/
  2. java/
  3. Android.mk
  4. AndroidManifest.xml
  5. CONTRIBUTING
  6. LICENSE