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

Change-Id: I484cd07fb67b40b54d7ad4b1ae7324a0d370ed6a