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

* commit '30e2bb845a66c3103cb23fa01d616a84b6fa565d':
  Revert "Move text logic from jni to hwui level"