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

* commit '4d9df358ec847262872c09962105537be350f8fd':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"