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

* commit '8c971ae5a0d294175481426d4543e23dc8d4a349':
  Revert "Update StaticLayout_Delegate to use new nLoadHyphenator"