Merge changes Ibc853aa4,I061e3b45,I31983153
am: 96a2f8ec01

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