Merge changes Ia566fce6,I36f03c07,I81492f7f
am: 3523770fcf

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