am e193c525: Revert  Ida230ca42 and I6adf7d08f.

* commit 'e193c5255d96d3971ee207b459a8a1e91c0d176c':
  Revert  Ida230ca42 and I6adf7d08f.
tree: c4280303288bd7862f5b414b97a5e22432923292
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk