Merge "Revert "Move text logic from jni to hwui level"" into nyc-dev
am: 6847953

* commit '6847953955502caa0bd0ba255d879a89aeccbd24':
  Revert "Move text logic from jni to hwui level"