Merge branch 'cff-subset' of https://github.com/harfbuzz/harfbuzz into cff-subset