Merge changes I7888797c,I57b2232f

* changes:
  Refactor + small bugfix
  Refactoring
tree: 61069c4d6520c8c5a11b8c56e9781c5045327a8f
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk