[[ HarfBuzz ]] Revert changes to skia