SkTypeface: fix build errors caused by merging