Revert "Update Typeface_Delegate following Change I2744db73" DO NOT MERGE
am: f87bd04235

Change-Id: I1a6b8b0bba23c30537d9569aa903b9b004d1ece1