am b61394a0: am 24421e07: am 14ddbda6: am a38a15dd: Merge "tiny refactor"

* commit 'b61394a0e94e36f67040a891076ef8e8133f6b23':
tree: 1de4fe69ceaa40fa12a4e6d2dc559d48c8b199b3
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk