am 24a24b27: am ee4c8464: Merge "Handle surrogate pairs in Html.toHtml()" into klp-dev

* commit '24a24b27903785dedb507b11583b70975fe9f8e4':
  Handle surrogate pairs in Html.toHtml()