Merge changes I0e8549cf,I12ac7b89,I2c77f0c6,I3ba5795b
am: 6cd92f57ee

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