Merge "Layoutlib: more text drawing."