Merge "Upgrade FreeType to 96b5e50"