am 1017fb21: am 8099342d: am be4d38e6: Merge "Fix test breakage"

* commit '1017fb215777ff905023bfdc70446556c51ecd1d':
tree: 47ba921848209a1a9fb052aae5f055e12018e83b
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk