Merge "Upgrade freetype to VER-2-10-1"
am: 82b8fa5352

Change-Id: I2c3dc7338d6f1b9e1c1e60f00ba6978badba6074