Merge pull request #2497 from brendandahl/use-cff-compiler

Use CFF compiler for building Type1 font.