Merge "Clean up and rename TypefaceImpl" into nyc-dev
am: ef8ee4c

* commit 'ef8ee4c7bb606778274bfed5b479f97583bc7fae':
  Clean up and rename TypefaceImpl