Merge "Remove Typeface.create" into oc-dev