Merge changes I620aacf3,Ie5fe2fc1,I41f98fe2 am: 30842b2099 am: 997c31b954
am: c97dc3c240

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