am c6c17b93: am 962c9f05: Merge "Small cleanup"

* commit 'c6c17b933270d994caa127ba9ca96ecf35898a88':
  Small cleanup
tree: 46a9e4fc307d2afbabd200d788d838eabf0bbb50
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk