Merge branch 'main' into re_remove_ghosts

Author: gmackall

DEPS

@@ -14,7 +14,7 @@ vars = {
   'flutter_git': 'https://flutter.googlesource.com',
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
-  'skia_revision': '721bbd7c03401d40251d8618e86af42298ebee02',
+  'skia_revision': '42f9070e6625de60405a5850284a0891b4ff5ff7',
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.