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