[chromium-libs-media-freeworld: 248/259] More of the harfbuzz related fixes