Merge "Changes to Skia to support Harfbuzz NG"