am be4d38e6: Merge "Fix test breakage"

* commit 'be4d38e61fe96409764405af66cade5a609d6e1d':
  Fix test breakage
tree: f8b0186e87a74c88ecf90beda84803f91065bb7b
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk