Merge "Some cleanup and reinforcement"
tree: 16c8cdc7d0ae4a849ac9240ecef27ff8a2328a09
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk