Merge pull request #3365 from harfbuzz/gdef-fix

GDEF fix