Merge "Update Typeface_Delegate following commit 4131277" into master-layoutlib-dev