Merge "Enable Type1 and Type1CID fonts" am: 99fee66607 am: 719f26ee7b
am: 6e91d7b311

Change-Id: I44e86f44b510fdbdb2dbb1ad4a25e7a8f6423618