Merge "Small reorganization"
tree: bfcf58004a09f367ce809996b92f39cc68ff8697
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk