am ade725ed: Merge "Fix unit test"

* commit 'ade725ed019250ff446ba81d1f0ebf97b4527c2e':
  Fix unit test
tree: 306123aa9ec09080f69e8214d91d5920c8f20460
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk