diff --git a/DEPS b/DEPS
index e6ac0bd13..d9c3c4497 100644
--- a/DEPS
+++ b/DEPS
@@ -27,11 +27,11 @@ vars = {
 deps = {
   # Dependencies required to use GN/Clang in standalone
   'build': {
-    'url': '{chromium_git}/chromium/src/build@e13479c356a2d1098f18d9458d37bbbb5185b348',
+    'url': '{chromium_git}/chromium/src/build@deb9d19209591465b3eb7613e795d3ce2c32dc0b',
     'condition': 'gpgmm_standalone',
   },
   'buildtools': {
-    'url': '{chromium_git}/chromium/src/buildtools@b66292cfac1e55e328c6f49b6c9142bd8bcc9af5',
+    'url': '{chromium_git}/chromium/src/buildtools@27356dca4bb789ec6262625fd9f3d16666f6e405',
     'condition': 'gpgmm_standalone',
   },
   'buildtools/clang_format/script': {
@@ -57,15 +57,15 @@ deps = {
   },
 
   'buildtools/third_party/libc++/trunk': {
-    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxx.git@d2672adb7aafbb4bb6fdde2f9ab3e8bc83760563',
+    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxx.git@79a510511b03dc9a9f378ebe07c18c622b5bf349',
     'condition': 'gpgmm_standalone',
   },
   'buildtools/third_party/libc++abi/trunk': {
-    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxxabi.git@c86761b030be5c1b5d1e49a93bc54e1d5f1377b9',
+    'url': '{chromium_git}/external/github.com/llvm/llvm-project/libcxxabi.git@9643f2cf13d6935a84a30b7da7de53327733e190',
     'condition': 'gpgmm_standalone',
   },
   'tools/clang': {
-    'url': '{chromium_git}/chromium/src/tools/clang@64e9f9321c450d938fec79ef8e4431fd1a08f5ce',
+    'url': '{chromium_git}/chromium/src/tools/clang@4ea266791606d7c01df55770a6a9acdbc423289b',
     'condition': 'gpgmm_standalone',
   },
  'third_party/ninja': {
@@ -77,20 +77,20 @@ deps = {
   },
   # Testing, GTest and GMock
   'testing': {
-    'url': '{chromium_git}/chromium/src/testing@72efbfb6fe7b8c446f3c2bcfbd90fe3f4316bd71',
+    'url': '{chromium_git}/chromium/src/testing@18e0ae2d6381c570422fde9989d9a17b545fae7a',
     'condition': 'gpgmm_standalone',
   },
   'third_party/googletest': {
-    'url': '{chromium_git}/external/github.com/google/googletest@cead3d57c93ff8c4e5c1bbae57a5c0b0b0f6e168',
+    'url': '{chromium_git}/external/github.com/google/googletest@e9fb5c7bacc4a25b030569c92ff9f6925288f1c3',
     'condition': 'gpgmm_standalone',
   },
   'third_party/vulkan-deps': {
-    'url': '{chromium_git}/vulkan-deps@5c6770c857cc5ed591472f1375c47d49fbd16ed6',
+    'url': '{chromium_git}/vulkan-deps@d56f491466de515bec780ad1d70e53e523ab6e65',
     'condition': 'gpgmm_standalone',
   },
   # Dependency of //testing
   'third_party/catapult': {
-    'url': '{chromium_git}/catapult.git@5b6fd283971e1ca0956a9c2b96a45ebc3e861705',
+    'url': '{chromium_git}/catapult.git@9d41f74af7343a821aa418f8140e204814f92139',
     'condition': 'gpgmm_standalone',
   },
   'third_party/jsoncpp/source': {
diff --git a/third_party/libFuzzer/BUILD.gn b/third_party/libFuzzer/BUILD.gn
index ec8a7c65e..f6de75474 100644
--- a/third_party/libFuzzer/BUILD.gn
+++ b/third_party/libFuzzer/BUILD.gn
@@ -37,7 +37,6 @@ source_set("libfuzzer") {
     "src/FuzzerIOPosix.cpp",
     "src/FuzzerIOWindows.cpp",
     "src/FuzzerLoop.cpp",
-    "src/FuzzerMain.cpp",
     "src/FuzzerMerge.cpp",
     "src/FuzzerMutate.cpp",
     "src/FuzzerSHA1.cpp",
@@ -50,13 +49,14 @@ source_set("libfuzzer") {
     "src/FuzzerUtilWindows.cpp",
   ]
 
-  configs -= [
-    "//build/config/coverage:default_coverage",
-    "//build/config/sanitizers:default_sanitizer_flags",
-  ]
+  configs -= fuzzing_engine_remove_configs
+  configs += fuzzing_engine_add_configs
+  configs += [ ":libfuzzer_flags" ]
+}
 
-  configs += [
-    "//build/config/sanitizers:default_sanitizer_flags_but_coverage",
-    ":libfuzzer_flags",
-  ]
+source_set("libfuzzer_main") {
+  deps = [ ":libfuzzer" ]
+  configs -= fuzzing_engine_remove_configs
+  configs += fuzzing_engine_add_configs
+  sources = [ "src/FuzzerMain.cpp" ]
 }