am cfceaa81: Merge "Changes to Skia to support Harfbuzz NG"

* commit 'cfceaa81654c0b02a693e29d2763ef1540e55647':
  Changes to Skia to support Harfbuzz NG