am 14ddbda6: am a38a15dd: Merge "tiny refactor"

* commit '14ddbda63dc5bf7b2332014f6a0dfa0ddd84b331':
tree: 47a89f012ad5e2ba2bbb300f809b2354914163f9
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk