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

Change-Id: Ie5fc342cc35fa284f522b2a8b835a98c68e76deb