diff --git a/webrtc/BUILD.gn b/webrtc/BUILD.gn
index edd3872dde..9f75117af4 100644
--- a/webrtc/BUILD.gn
+++ b/webrtc/BUILD.gn
@@ -292,6 +292,7 @@ if (!build_with_chromium) {
       ":webrtc",
       "modules/video_capture:video_capture_internal_impl",
       "test",
+      "//build/config/sanitizers:deps",
     ]
   }
 
@@ -313,6 +314,7 @@ if (!build_with_chromium) {
       "test:field_trial",
       "test:test_common",
       "test:test_renderer",
+      "//build/config/sanitizers:deps",
       "//testing/gmock",
       "//testing/gtest",
       "//third_party/gflags",
diff --git a/webrtc/examples/BUILD.gn b/webrtc/examples/BUILD.gn
index 801ae0962f..e1fce2c521 100644
--- a/webrtc/examples/BUILD.gn
+++ b/webrtc/examples/BUILD.gn
@@ -430,6 +430,7 @@ if (is_linux || is_win) {
       public_configs = [ ":gtk2_config" ]
     }
     deps = [
+      "//build/config/sanitizers:deps",
       "//webrtc/api:libjingle_peerconnection",
       "//webrtc/system_wrappers:field_trial_default",
       "//webrtc/system_wrappers:metrics_default",
@@ -449,6 +450,7 @@ if (is_linux || is_win) {
       "peerconnection/server/utils.h",
     ]
     deps = [
+      "//build/config/sanitizers:deps",
       "//webrtc:webrtc_common",
       "//webrtc/base:rtc_base_approved",
       "//webrtc/tools:command_line_parser",
@@ -464,6 +466,7 @@ if (is_linux || is_win) {
       "relayserver/relayserver_main.cc",
     ]
     deps = [
+      "//build/config/sanitizers:deps",
       "//webrtc/base:rtc_base_approved",
       "//webrtc/pc:rtc_pc",
       "//webrtc/system_wrappers:field_trial_default",
@@ -480,6 +483,7 @@ if (is_linux || is_win) {
       "turnserver/turnserver_main.cc",
     ]
     deps = [
+      "//build/config/sanitizers:deps",
       "//webrtc/base:rtc_base_approved",
       "//webrtc/pc:rtc_pc",
       "//webrtc/system_wrappers:field_trial_default",
@@ -496,6 +500,7 @@ if (is_linux || is_win) {
       "stunserver/stunserver_main.cc",
     ]
     deps = [
+      "//build/config/sanitizers:deps",
       "//webrtc/base:rtc_base_approved",
       "//webrtc/pc:rtc_pc",
       "//webrtc/system_wrappers:field_trial_default",
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 2f28cccb1c..0491022034 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -963,6 +963,7 @@ if (rtc_include_tests) {
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_support",
       "../rtp_rtcp",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
       "//third_party/gflags:gflags",
     ]
@@ -992,6 +993,7 @@ if (rtc_include_tests) {
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_support",
       "../rtp_rtcp",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
       "//third_party/gflags:gflags",
     ]
@@ -1291,6 +1293,7 @@ if (rtc_include_tests) {
       ":pcm16b",
       ":webrtc_opus",
       "../../common_audio",
+      "//build/config/sanitizers:deps",
     ]
 
     configs += [ ":RTPencode_config" ]
@@ -1321,6 +1324,7 @@ if (rtc_include_tests) {
 
     deps = [
       ":neteq_test_tools",
+      "//build/config/sanitizers:deps",
     ]
   }
 
@@ -1334,6 +1338,7 @@ if (rtc_include_tests) {
     deps = [
       "../../system_wrappers:system_wrappers_default",
       "../../test:rtp_test_utils",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
     ]
   }
@@ -1347,6 +1352,7 @@ if (rtc_include_tests) {
 
     deps = [
       ":neteq_test_tools",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
     ]
   }
@@ -1355,6 +1361,7 @@ if (rtc_include_tests) {
     testonly = true
     deps = [
       "../..:webrtc_common",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
     ]
     sources = [
@@ -1374,6 +1381,7 @@ if (rtc_include_tests) {
       ":neteq_unittest_tools",
       ":pcm16b",
       "../../system_wrappers:system_wrappers_default",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
       "//third_party/gflags:gflags",
     ]
@@ -1398,6 +1406,7 @@ if (rtc_include_tests) {
       ":neteq_unittest_tools",
       ":webrtc_opus",
       "../../test:test_support_main",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
       "//third_party/gflags",
     ]
@@ -1415,6 +1424,7 @@ if (rtc_include_tests) {
       ":neteq_test_support",
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_support",
+      "//build/config/sanitizers:deps",
       "//third_party/gflags",
     ]
   }
@@ -1428,6 +1438,7 @@ if (rtc_include_tests) {
       ":neteq",
       ":webrtc_opus",
       "../../system_wrappers:system_wrappers_default",
+      "//build/config/sanitizers:deps",
     ]
   }
 
@@ -1445,6 +1456,7 @@ if (rtc_include_tests) {
       ":neteq_unittest_tools",
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_support_main",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
       "//third_party/gflags",
     ]
@@ -1462,6 +1474,7 @@ if (rtc_include_tests) {
       ":neteq",
       ":neteq_test_support",
       "../../test:test_support_main",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
       "//third_party/gflags",
     ]
@@ -1479,6 +1492,7 @@ if (rtc_include_tests) {
       ":neteq",
       ":neteq_test_support",
       "../../test:test_support_main",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
       "//third_party/gflags",
     ]
@@ -1494,6 +1508,7 @@ if (rtc_include_tests) {
     deps = [
       ":isac_fix",
       "../../test:test_support",
+      "//build/config/sanitizers:deps",
     ]
 
     if (is_win) {
diff --git a/webrtc/modules/audio_device/BUILD.gn b/webrtc/modules/audio_device/BUILD.gn
index d39f34a8cf..6514946b28 100644
--- a/webrtc/modules/audio_device/BUILD.gn
+++ b/webrtc/modules/audio_device/BUILD.gn
@@ -233,6 +233,7 @@ if (rtc_include_tests && !is_ios) {
       "../../test:test_support_main",
       "../rtp_rtcp",
       "../utility",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
     ]
     configs += [ "../..:common_config" ]
diff --git a/webrtc/modules/audio_processing/BUILD.gn b/webrtc/modules/audio_processing/BUILD.gn
index b700afa96a..dca33885ff 100644
--- a/webrtc/modules/audio_processing/BUILD.gn
+++ b/webrtc/modules/audio_processing/BUILD.gn
@@ -339,6 +339,7 @@ if (rtc_include_tests) {
       "../../system_wrappers",
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_support",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
       "//third_party/gflags:gflags",
     ]
@@ -366,6 +367,7 @@ if (rtc_include_tests) {
       ":audioproc_test_utils",
       "../../common_audio",
       "../../system_wrappers:system_wrappers_default",
+      "//build/config/sanitizers:deps",
       "//third_party/gflags:gflags",
     ]
   }  # unpack_aecdump
@@ -399,6 +401,7 @@ if (rtc_include_tests) {
       "../../system_wrappers",
       "../../system_wrappers:system_wrappers_default",
       "../../test:test_support",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
       "//third_party/gflags:gflags",
     ]
@@ -442,7 +445,7 @@ if (rtc_include_tests) {
       ]
 
       deps = [
-        ":audioproc_unittest_proto",
+        ":audioproc_debug_proto",
       ]
     }
   }
diff --git a/webrtc/modules/rtp_rtcp/BUILD.gn b/webrtc/modules/rtp_rtcp/BUILD.gn
index 2abb025994..fb270b315a 100644
--- a/webrtc/modules/rtp_rtcp/BUILD.gn
+++ b/webrtc/modules/rtp_rtcp/BUILD.gn
@@ -192,6 +192,7 @@ if (rtc_include_tests) {
 
     deps = [
       ":rtp_rtcp",
+      "//build/config/sanitizers:deps",
       "//testing/gtest",
       "//webrtc/test:test_support_main",
     ]
diff --git a/webrtc/tools/BUILD.gn b/webrtc/tools/BUILD.gn
index 5cd2754080..0fe92314ef 100644
--- a/webrtc/tools/BUILD.gn
+++ b/webrtc/tools/BUILD.gn
@@ -63,6 +63,7 @@ executable("frame_analyzer") {
   deps = [
     ":command_line_parser",
     ":video_quality_analysis",
+    "//build/config/sanitizers:deps",
     "//build/win:default_exe_manifest",
   ]
 }
@@ -78,6 +79,7 @@ executable("psnr_ssim_analyzer") {
   deps = [
     ":command_line_parser",
     ":video_quality_analysis",
+    "//build/config/sanitizers:deps",
     "//build/win:default_exe_manifest",
   ]
 }
@@ -95,6 +97,7 @@ executable("rgba_to_i420_converter") {
   deps = [
     ":command_line_parser",
     "../common_video",
+    "//build/config/sanitizers:deps",
     "//build/win:default_exe_manifest",
   ]
 }
@@ -133,6 +136,7 @@ executable("frame_editor") {
   deps = [
     ":command_line_parser",
     ":frame_editing_lib",
+    "//build/config/sanitizers:deps",
     "//build/win:default_exe_manifest",
   ]
 }
@@ -154,6 +158,7 @@ executable("force_mic_volume_max") {
   deps = [
     "../system_wrappers:system_wrappers_default",
     "../voice_engine",
+    "//build/config/sanitizers:deps",
     "//build/win:default_exe_manifest",
   ]
 }
@@ -201,6 +206,7 @@ if (rtc_include_tests) {
         "../modules/rtp_rtcp:rtp_rtcp",
         "../system_wrappers:system_wrappers_default",
         "../test:field_trial",
+        "//build/config/sanitizers:deps",
         "//third_party/gflags",
       ]
     }
diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn
index e330bab4cc..8f0e9f322f 100644
--- a/webrtc/voice_engine/BUILD.gn
+++ b/webrtc/voice_engine/BUILD.gn
@@ -181,6 +181,7 @@ if (rtc_include_tests) {
 
       deps = [
         ":voice_engine",
+        "//build/config/sanitizers:deps",
         "//testing/gmock",
         "//testing/gtest",
         "//third_party/gflags",