Merge changes I46744e51,I1f566cce

* changes:
  Solidify and optimize Paint text related APIs
  Add more optimizations for Text measuring / breaking / getting advances