Merge "Clean up and rename TypefaceImpl" into nyc-dev