am fbb38cd1: Merge "Fix bug 6888377: crash in GetUnitsPerEm on locale change" into jb-mr1-dev

* commit 'fbb38cd17727043aa04957aa5edd7c9fec4d076a':
  Fix bug 6888377: crash in GetUnitsPerEm on locale change