Merge changes I4b5a494b,I4b6f7ca8 am: 4662229bb3 am: 860435c4ff
am: 5427665ba9

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