am 9773cd73: (-s ours) am f470ed86: Merge "Support surrogate pairs when layouting text"

Merge commit '9773cd73b627c8521257c005881554d183d19a63'

* commit '9773cd73b627c8521257c005881554d183d19a63':
  Support surrogate pairs when layouting text