Merge "Some cleanups"
tree: 28898235479adf43b664acf5efc72709a4162633
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk