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

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