Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev