Revert "Update Typeface_Delegate following Change I2744db73" DO NOT MERGE

This reverts commit 71d064e47d0139f17094c6f9023f853a722e4bfc.

Change-Id: I25f45f89e74194ebf8dac81c9bdf2dd9e181aa62
2 files changed