Merge pull request #1583 from harfbuzz/cff-retain-gids

[subset] Implement --retain-gids with CFF/CFF2