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

* commit '8099342df30ecfc4808853d65a0e91c0d3ca31a6':
tree: 47a89f012ad5e2ba2bbb300f809b2354914163f9
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk