Merge changes I9a5b30d6,Ie9e7b741,I415f5b7e,I86e720b8,Ia8b7d508, ...
am: 958b292fc0

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