am 2db91af6: am 2d93475c: Merge "Revert "Fix bug #8194572 Chrome SIGBUS\'es on launch around TextLayoutCacheKey"" into jb-mr2-dev

* commit '2db91af6a6f50e693163808e5a29f11232c89dbd':
  Revert "Fix bug #8194572 Chrome SIGBUS'es on launch around TextLayoutCacheKey"