[subset] temporarily revert previous cmap commit Required in https://github.com/harfbuzz/harfbuzz/issues/2356