Merge "Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"" into mnc-ub-dev am: 8c971ae5a0
am: 867c370465

* commit '867c3704652d40118b47e9c97149e7fd9567a16b':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"