am 065f126f: Merge "Fix two nasty bugs with surrogate pairs."

* commit '065f126f1d91b8b2647cbe185a55ac8e771cb32d':
  Fix two nasty bugs with surrogate pairs.
tree: 5d3964dd1d946c1004936920b6f56016cd0c2940
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk