Simplify TextRenderer API, cleanup style.

Change-Id: Ia1c3474232e27324dbaaaa4f6f731b6444f43fa4
Merge topic 'SimplifyTextRendererAPI' into master

d3617b58 Simplify TextRenderer API, cleanup style.