Merge "Clean up public FontConfig APIs"