Merge changes I84ec0ac5,I2b92e1e0,Ic30fa6c6
am: 0d1362b28a

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