Merge "Fix a long-standing race condition."
tree: 1c2641d8be9a5e60da6ba73bb6e6dc8402f1e4b9
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk