Merge "use new SkFontMgr API"