diff --git a/DEPS b/DEPS
index 410883c..dc3835a 100644
--- a/DEPS
+++ b/DEPS
@@ -5,7 +5,7 @@
   'pdfium_git': 'https://pdfium.googlesource.com',
 
   'android_ndk_revision': '26d93ec07f3ce2ec2cdfeae1b21ee6f12ff868d8',
-  'build_revision': 'a9eff4d3d2a7c61a9315ab67780413f20962e541',
+  'build_revision': 'f671d3baeb64d9dba628ad582e867cf1aebc0207',
   'buildtools_revision': 'e6b510a9daf822bbe9f922c200c58150803d2fd8',
   'catapult_revision': '86352b966b0245d6883e5f7df27687856978b6d7',
   'clang_revision': 'ae881aab392c247eca831e079d1d45e1c200cce7',
diff --git a/samples/BUILD.gn b/samples/BUILD.gn
index d658a33..779d4f3 100644
--- a/samples/BUILD.gn
+++ b/samples/BUILD.gn
@@ -53,7 +53,7 @@
   deps = [
     "../:pdfium",
     "../:test_support",
-    "//build/config/sanitizers:deps",
+    "//build/config:exe_and_shlib_deps",
     "//build/win:default_exe_manifest",
   ]
   if (!pdf_enable_xfa) {
@@ -82,7 +82,7 @@
   ]
   deps = [
     "../:pdfium",
-    "//build/config/sanitizers:deps",
+    "//build/config:exe_and_shlib_deps",
     "//build/win:default_exe_manifest",
   ]
   if (!pdf_enable_xfa) {
diff --git a/third_party/yasm/BUILD.gn b/third_party/yasm/BUILD.gn
index adcb833..b2dcb57 100644
--- a/third_party/yasm/BUILD.gn
+++ b/third_party/yasm/BUILD.gn
@@ -58,7 +58,7 @@
       "//build/config/compiler:no_chromium_code",
     ]
     deps = [
-      "//build/config/sanitizers:deps",
+      "//build/config:exe_and_shlib_deps",
 
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
@@ -75,7 +75,7 @@
       "//build/config/compiler:no_chromium_code",
     ]
     deps = [
-      "//build/config/sanitizers:deps",
+      "//build/config:exe_and_shlib_deps",
 
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
@@ -96,7 +96,7 @@
 
     deps = [
       ":yasm_utils",
-      "//build/config/sanitizers:deps",
+      "//build/config:exe_and_shlib_deps",
 
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
@@ -128,7 +128,7 @@
       "//build/config/compiler:no_chromium_code",
     ]
     deps = [
-      "//build/config/sanitizers:deps",
+      "//build/config:exe_and_shlib_deps",
 
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
@@ -145,7 +145,7 @@
       "//build/config/compiler:no_chromium_code",
     ]
     deps = [
-      "//build/config/sanitizers:deps",
+      "//build/config:exe_and_shlib_deps",
 
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
@@ -189,7 +189,7 @@
       ":re2c_warnings",
     ]
     deps = [
-      "//build/config/sanitizers:deps",
+      "//build/config:exe_and_shlib_deps",
 
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",
@@ -338,7 +338,7 @@
       ":generate_module",
       ":generate_version",
       ":yasm_utils",
-      "//build/config/sanitizers:deps",
+      "//build/config:exe_and_shlib_deps",
 
       # Default manifest on Windows (a no-op elsewhere).
       "//build/win:default_exe_manifest",