Merge "Update TypefaceTest to reflect API changes." into oc-dev