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

* commit '49658d43802dc74c0ad68b7f5ba509832c1dec81':
  Move text logic from jni to hwui level