Merge "Reland: Move text logic from jni to hwui level" into nyc-dev am: d8e91f6
am: b08bd4e

* commit 'b08bd4e2a3dedeee184e7de7436ecf0402653008':
  Reland: Move text logic from jni to hwui level