Add back cid cff font test.
Merge pull request #2942 from brendandahl/add-back-cid

Add back cid cff font test.
Merge remote-tracking branch 'upstream/master'