Merge changes I5092942a,I931c553f

* changes:
  [IL80] Reverse a test for clarity.
  [IL79] Some refactoring
tree: 62d37ca0cde1bfab6f5c38692fdb6b28058195a5
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk