Merge "Upgrade fonttools from 3.31.0 to 3.35.0"
am: 7ce473d6ec

Change-Id: I0d9a7d9381f534fcefbd0f775fc600d0c36af36b