Remove cid dictionary values for normalized fonts.
Merge pull request #2463 from brendandahl/remove-cid-keys

Remove cid dictionary values for normalized fonts.