Merge "Fix some flaky tests."
tree: 407124d4e3a0a286cc2695c0e774f65c16174487
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk