Merge changes Iaf6e217d,Ib22e33de,If9fd6ca9 am: 65aa3b3677 am: 886879d36a
am: 80af1085e1

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