Merge "Some renaming"
tree: 174e799d7bc50f1aee5c2bf6eefb6198880d5e2b
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk