Merge changes Id8170206,I4e63ef1d,I05e176ef am: 21de509b13 am: 9d22414b82
am: a300c01b2b

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