am 46e327ca: (-s ours) Merge "Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE" into ics-mr0

* commit '46e327ca32a29432941ba4487077577b10243aed':
  Fix bug #5504346 Hung in native_getTextRunAdvances - DO NOT MERGE