Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev am: 1e924df63e
am: fa4b862518

Change-Id: I0aa32f46d20a5d46454f2a6057db2ca0e70f1d84