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

* commit '24421e07f5f0fe0d7b399eb3b642249b149e78e6':
tree: 47ba921848209a1a9fb052aae5f055e12018e83b
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk