am a38a15dd: Merge "tiny refactor"

* commit 'a38a15ddc0aa314578828de29bba51cfcf39c8de':
  tiny refactor
tree: fd34fb4af1a3fe77ed1534179d85c5bf66a0ee2c
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk