Revert "Folded CFF2 classes into CFF classes. Removed:"
Revert "Folded CFF2 classes into CFF classes. Removed:"

This reverts commit ff14e2361b8fcbb8fd753b7ef5f02a74ad004dc7.

googlefonts/fonttools,fonttools/fonttools