Merge changes Id8170206,I4e63ef1d,I05e176ef
am: 21de509b13

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