Convert cid to Unicode when rebuilding Type 2 CID fonts encoded with non-Identity CMap
Merge remote-tracking branch 'mozilla/master' into cidtype2

Conflicts:
	test/test_manifest.json