am c6aaa48e: Merge "Some cleanups"

# Via Android (Google) Code Review (1) and Jean Chalard (1)
* commit 'c6aaa48ea7fa021112cc163730b5bce574c6877b':
  Some cleanups
tree: 3ba14e42c00a341c80a207c2cb0587665b485727
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk