Cleanup BUILD.gn files from imports like foo:foo

Repalce all occurrences of foo:foo in deps with just foo in BUILD.gn
files.

Done with Sublime regex replace.
Find: \b([-a-zA-Z0-9_]+):+\1\b
In: *.gn
Replace with: \1

Bug: None
Change-Id: I40aba1b14face687a595b852ffe443cb20197611
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/127899
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Artem Titov <titovartem@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27225}
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index 56792e9..8575e71 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -47,7 +47,7 @@
     "../../api:array_view",
     "../../api/audio:audio_frame_api",
     "../../api/audio_codecs:audio_codecs_api",
-    "../../common_audio:common_audio",
+    "../../common_audio",
     "../../common_audio:common_audio_c",
     "../../logging:rtc_event_log_api",
     "../../rtc_base:audio_format_to_string",
@@ -1041,8 +1041,8 @@
     "../../api:array_view",
     "../../api:rtp_headers",
     "../../common_audio",
+    "../../rtc_base",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/system:arch",
     "../../test:rtp_test_utils",
@@ -1088,7 +1088,7 @@
     "../../rtc_base:rtc_base_approved",
     "../rtp_rtcp",
     "../rtp_rtcp:rtp_rtcp_format",
-    "//third_party/abseil-cpp/absl/strings:strings",
+    "//third_party/abseil-cpp/absl/strings",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 
@@ -1961,8 +1961,8 @@
       "../../logging:rtc_event_audio",
       "../../logging:rtc_event_log_api",
       "../../modules/rtp_rtcp:rtp_rtcp_format",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_base_tests_utils",
       "../../rtc_base:sanitizer",
diff --git a/modules/audio_coding/codecs/opus/test/BUILD.gn b/modules/audio_coding/codecs/opus/test/BUILD.gn
index 058dbfa..51b0df3 100644
--- a/modules/audio_coding/codecs/opus/test/BUILD.gn
+++ b/modules/audio_coding/codecs/opus/test/BUILD.gn
@@ -27,7 +27,7 @@
     ]
 
     deps = [
-      "../../../../../common_audio:common_audio",
+      "../../../../../common_audio",
       "../../../../../common_audio:common_audio_c",
       "../../../../../rtc_base:checks",
       "../../../../../rtc_base/memory:aligned_array",
@@ -45,7 +45,7 @@
 
     deps = [
       ":test",
-      "../../../../../common_audio:common_audio",
+      "../../../../../common_audio",
       "../../../../../common_audio:common_audio_c",
       "../../../../../rtc_base:rtc_base_approved",
       "../../../../../test:test_support",
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index e04b031..52e0181 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -75,9 +75,9 @@
       ":audio_device_buffer",
       ":audio_device_generic",
       "../../api:array_view",
+      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:gtest_prod",
-      "../../rtc_base:rtc_base",
       "../../rtc_base/system:fallthrough",
       "../../sdk:audio_device",
       "../../sdk:audio_objc",
@@ -203,13 +203,13 @@
     ":audio_device_generic",
     "../../api:array_view",
     "../../api:scoped_refptr",
+    "../../api/task_queue",
     "../../api/task_queue:global_task_queue_factory",
-    "../../api/task_queue:task_queue",
     "../../common_audio",
     "../../common_audio:common_audio_c",
+    "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base:deprecation",
-    "../../rtc_base:rtc_base",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_task_queue",
     "../../rtc_base/system:arch",
@@ -440,7 +440,7 @@
       "../../system_wrappers",
       "../../test:fileutils",
       "../../test:test_support",
-      "../utility:utility",
+      "../utility",
       "//third_party/abseil-cpp/absl/types:optional",
     ]
     if (is_linux || is_mac || is_win) {
diff --git a/modules/audio_processing/BUILD.gn b/modules/audio_processing/BUILD.gn
index c606b7f..f99c44d 100644
--- a/modules/audio_processing/BUILD.gn
+++ b/modules/audio_processing/BUILD.gn
@@ -81,7 +81,7 @@
   deps = [
     ":api",
     "../../api/audio:audio_frame_api",
-    "../../common_audio:common_audio",
+    "../../common_audio",
     "../../common_audio:common_audio_c",
     "../../rtc_base:checks",
   ]
@@ -163,7 +163,7 @@
     "../../api/audio:echo_control",
     "../../audio/utility:audio_frame_operations",
     "../../common_audio:common_audio_c",
-    "../../common_audio/third_party/fft4g:fft4g",
+    "../../common_audio/third_party/fft4g",
     "../../rtc_base:checks",
     "../../rtc_base:deprecation",
     "../../rtc_base:gtest_prod",
@@ -174,9 +174,9 @@
     "../../system_wrappers:cpu_features_api",
     "../../system_wrappers:field_trial",
     "../../system_wrappers:metrics",
-    "aec:aec",
+    "aec",
     "aec:aec_core",
-    "aec3:aec3",
+    "aec3",
     "aecm:aecm_core",
     "agc",
     "agc:agc_legacy_c",
@@ -253,7 +253,7 @@
   deps = [
     ":audio_frame_view",
     "../../rtc_base:rtc_base_approved",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
   ]
 }
 
@@ -266,9 +266,9 @@
   deps = [
     ":audio_generator_interface",
     ":file_audio_generator",
-    "../../common_audio:common_audio",
+    "../../common_audio",
     "../../rtc_base:rtc_base_approved",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
     "//third_party/abseil-cpp/absl/memory",
   ]
 }
@@ -280,9 +280,9 @@
   ]
   deps = [
     ":audio_generator_interface",
-    "../../common_audio:common_audio",
+    "../../common_audio",
     "../../rtc_base:rtc_base_approved",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
   ]
 }
 
@@ -318,7 +318,7 @@
     "../..:webrtc_common",
     "../../common_audio",
     "../../common_audio:common_audio_c",
-    "../../common_audio/third_party/fft4g:fft4g",
+    "../../common_audio/third_party/fft4g",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
     "../../system_wrappers:cpu_features_api",
@@ -363,7 +363,7 @@
   ]
   deps = [
     "../../api:array_view",
-    "../../common_audio:common_audio",
+    "../../common_audio",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
   ]
@@ -443,12 +443,12 @@
       "../../api:scoped_refptr",
       "../../api/audio:aec3_config",
       "../../api/audio:aec3_factory",
-      "../../common_audio:common_audio",
+      "../../common_audio",
       "../../common_audio:common_audio_c",
+      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:gtest_prod",
       "../../rtc_base:protobuf_utils",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_base_tests_utils",
       "../../rtc_base:safe_minmax",
@@ -576,7 +576,7 @@
     deps = [
       "../../api:array_view",
       "../../api/audio:audio_frame_api",
-      "../../common_audio:common_audio",
+      "../../common_audio",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:safe_minmax",
@@ -612,7 +612,7 @@
         ":runtime_settings_protobuf_utils",
         "../../api/audio:aec3_config_json",
         "../../api/audio:aec3_factory",
-        "../../common_audio:common_audio",
+        "../../common_audio",
         "../../rtc_base:checks",
         "../../rtc_base:protobuf_utils",
         "../../rtc_base:rtc_base_approved",
@@ -688,7 +688,7 @@
     deps = [
       ":audio_processing",
       "../..:webrtc_common",
-      "../../common_audio:common_audio",
+      "../../common_audio",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base/system:file_wrapper",
       "../../system_wrappers",
diff --git a/modules/audio_processing/agc2/rnn_vad/BUILD.gn b/modules/audio_processing/agc2/rnn_vad/BUILD.gn
index b26aef0..3748a71 100644
--- a/modules/audio_processing/agc2/rnn_vad/BUILD.gn
+++ b/modules/audio_processing/agc2/rnn_vad/BUILD.gn
@@ -122,7 +122,7 @@
     deps = [
       ":rnn_vad",
       "../../../../api:array_view",
-      "../../../../common_audio:common_audio",
+      "../../../../common_audio",
       "../../../../rtc_base:rtc_base_approved",
       "../../../../test:test_support",
     ]
diff --git a/modules/audio_processing/vad/BUILD.gn b/modules/audio_processing/vad/BUILD.gn
index 6c64e94..bf99115 100644
--- a/modules/audio_processing/vad/BUILD.gn
+++ b/modules/audio_processing/vad/BUILD.gn
@@ -38,7 +38,7 @@
     "../../../audio/utility:audio_frame_operations",
     "../../../common_audio",
     "../../../common_audio:common_audio_c",
-    "../../../common_audio/third_party/fft4g:fft4g",
+    "../../../common_audio/third_party/fft4g",
     "../../../rtc_base:checks",
     "../../audio_coding:isac_vad",
   ]
diff --git a/modules/bitrate_controller/BUILD.gn b/modules/bitrate_controller/BUILD.gn
index 1f013f8..5f6d95a 100644
--- a/modules/bitrate_controller/BUILD.gn
+++ b/modules/bitrate_controller/BUILD.gn
@@ -44,7 +44,7 @@
     "../../system_wrappers:metrics",
     "../congestion_controller/goog_cc:delay_based_bwe",
     "../pacing",
-    "../remote_bitrate_estimator:remote_bitrate_estimator",
+    "../remote_bitrate_estimator",
     "../rtp_rtcp",
     "../rtp_rtcp:rtp_rtcp_format",
     "//third_party/abseil-cpp/absl/memory",
@@ -65,13 +65,13 @@
       "../../logging:mocks",
       "../../logging:rtc_event_bwe",
       "../../logging:rtc_event_log_api",
-      "../../system_wrappers:system_wrappers",
+      "../../system_wrappers",
       "../../test:field_trial",
       "../../test:test_support",
       "../congestion_controller/goog_cc:delay_based_bwe",
+      "../pacing",
       "../pacing:mock_paced_sender",
-      "../pacing:pacing",
-      "../remote_bitrate_estimator:remote_bitrate_estimator",
+      "../remote_bitrate_estimator",
       "../rtp_rtcp:rtp_rtcp_format",
     ]
   }
diff --git a/modules/congestion_controller/BUILD.gn b/modules/congestion_controller/BUILD.gn
index 0a99433..caa6d7f 100644
--- a/modules/congestion_controller/BUILD.gn
+++ b/modules/congestion_controller/BUILD.gn
@@ -58,7 +58,7 @@
   ]
 
   if (!build_with_mozilla) {
-    deps += [ "../../rtc_base:rtc_base" ]
+    deps += [ "../../rtc_base" ]
   }
 }
 
@@ -75,7 +75,7 @@
     "../../modules:module_api",
     "../../rtc_base:checks",
     "../../rtc_base:rtc_base_approved",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
     "../rtp_rtcp:rtp_rtcp_format",
     "rtp:transport_feedback",
   ]
@@ -112,17 +112,17 @@
       ":mock_congestion_controller",
       ":transport_feedback",
       "../../logging:mocks",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base/network:sent_packet",
       "../../system_wrappers",
       "../../test:field_trial",
       "../../test:test_support",
-      "../bitrate_controller:bitrate_controller",
+      "../bitrate_controller",
+      "../pacing",
       "../pacing:mock_paced_sender",
-      "../pacing:pacing",
-      "../remote_bitrate_estimator:remote_bitrate_estimator",
+      "../remote_bitrate_estimator",
       "../rtp_rtcp:rtp_rtcp_format",
       "bbr:bbr_unittests",
       "goog_cc:estimators",
diff --git a/modules/congestion_controller/goog_cc/BUILD.gn b/modules/congestion_controller/goog_cc/BUILD.gn
index 36fd72d..161cb3b 100644
--- a/modules/congestion_controller/goog_cc/BUILD.gn
+++ b/modules/congestion_controller/goog_cc/BUILD.gn
@@ -205,7 +205,7 @@
       "../../../api/units:timestamp",
       "../../../logging:rtc_event_log_api",
       "../../../rtc_base:checks",
-      "../../remote_bitrate_estimator:remote_bitrate_estimator",
+      "../../remote_bitrate_estimator",
       "//third_party/abseil-cpp/absl/types:optional",
     ]
   }
diff --git a/modules/congestion_controller/rtp/BUILD.gn b/modules/congestion_controller/rtp/BUILD.gn
index d3c705c..a075cce 100644
--- a/modules/congestion_controller/rtp/BUILD.gn
+++ b/modules/congestion_controller/rtp/BUILD.gn
@@ -43,7 +43,7 @@
   ]
 
   if (!build_with_mozilla) {
-    deps += [ "../../../rtc_base:rtc_base" ]
+    deps += [ "../../../rtc_base" ]
   }
 }
 rtc_static_library("transport_feedback") {
@@ -84,16 +84,16 @@
       "../:mock_congestion_controller",
       "../../../api/transport:network_control",
       "../../../logging:mocks",
+      "../../../rtc_base",
       "../../../rtc_base:checks",
-      "../../../rtc_base:rtc_base",
       "../../../rtc_base:rtc_base_approved",
       "../../../rtc_base/network:sent_packet",
       "../../../system_wrappers",
       "../../../test:field_trial",
       "../../../test:test_support",
+      "../../pacing",
       "../../pacing:mock_paced_sender",
-      "../../pacing:pacing",
-      "../../remote_bitrate_estimator:remote_bitrate_estimator",
+      "../../remote_bitrate_estimator",
       "../../rtp_rtcp:rtp_rtcp_format",
       "//testing/gmock",
     ]
diff --git a/modules/desktop_capture/BUILD.gn b/modules/desktop_capture/BUILD.gn
index ca13924..9e7f53c 100644
--- a/modules/desktop_capture/BUILD.gn
+++ b/modules/desktop_capture/BUILD.gn
@@ -37,7 +37,7 @@
   ]
 
   if (!build_with_mozilla) {
-    deps += [ "../../rtc_base:rtc_base" ]  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
+    deps += [ "../../rtc_base" ]  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
   }
 }
 
@@ -56,7 +56,7 @@
         ":desktop_capture_mock",
         ":primitives",
         ":screen_drawer",
-        "../../rtc_base:rtc_base",
+        "../../rtc_base",
         "../../rtc_base:rtc_base_approved",
         "../../rtc_base/third_party/base64",
         "../../system_wrappers",
@@ -240,8 +240,8 @@
       ":desktop_capture_generic",
       ":primitives",
       "../../api:scoped_refptr",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base/synchronization:rw_lock_wrapper",
       "../../sdk:helpers_objc",
@@ -430,8 +430,8 @@
     ":primitives",
     "../../api:refcountedbase",
     "../../api:scoped_refptr",
+    "../../rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base",  # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
     "../../rtc_base/synchronization:rw_lock_wrapper",
     "../../rtc_base/system:arch",
     "../../rtc_base/system:rtc_export",
diff --git a/modules/remote_bitrate_estimator/BUILD.gn b/modules/remote_bitrate_estimator/BUILD.gn
index 12d3086..e15f375 100644
--- a/modules/remote_bitrate_estimator/BUILD.gn
+++ b/modules/remote_bitrate_estimator/BUILD.gn
@@ -132,9 +132,9 @@
       "../../api/transport:field_trial_based_config",
       "../../api/transport:network_control",
       "../../logging:mocks",
+      "../../rtc_base",
       "../../rtc_base:checks",
       "../../rtc_base:gtest_prod",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_numerics",
       "../../rtc_base:safe_minmax",
@@ -172,7 +172,7 @@
       ":bwe_simulator_lib",
       ":remote_bitrate_estimator",
       "../../rtc_base:rtc_base_approved",
-      "../../system_wrappers:system_wrappers",
+      "../../system_wrappers",
       "../../test:field_trial",
       "../../test:fileutils",
       "../../test:test_support",
@@ -204,14 +204,14 @@
       ":remote_bitrate_estimator",
       "..:module_api_public",
       "../..:webrtc_common",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../system_wrappers",
       "../../test:field_trial",
       "../../test:fileutils",
       "../../test:test_support",
-      "../pacing:pacing",
+      "../pacing",
       "../rtp_rtcp:rtp_rtcp_format",
     ]
   }
@@ -227,7 +227,7 @@
       ":remote_bitrate_estimator",
       "../..:webrtc_common",
       "../../rtc_base:rtc_base_approved",
-      "../../system_wrappers:system_wrappers",
+      "../../system_wrappers",
       "../../test:fileutils",
       "../../test:test_main",
       "../../test:test_support",
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 3c247da..ec84ed8 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -444,7 +444,7 @@
       "../../api/video:video_frame",
       "../../api/video_codecs:video_codecs_api",
       "../../call:rtp_receiver",
-      "../../common_video:common_video",
+      "../../common_video",
       "../../common_video/test:utilities",
       "../../logging:mocks",
       "../../logging:rtc_event_log_api",
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index f174ae9..44db2c6 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -149,9 +149,9 @@
         "../../api:scoped_refptr",
         "../../api/video:video_frame",
         "../../api/video:video_frame_i420",
-        "../../common_video:common_video",
+        "../../common_video",
         "../../rtc_base:rtc_base_approved",
-        "../../system_wrappers:system_wrappers",
+        "../../system_wrappers",
         "../../test:test_support",
         "../../test:video_test_common",
         "../utility",
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 0cd9566..0e0866c 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -27,7 +27,7 @@
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base/experiments:alr_experiment",
     "../../rtc_base/experiments:rtt_mult_experiment",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
     "//third_party/abseil-cpp/absl/types:optional",
     "//third_party/abseil-cpp/absl/types:variant",
   ]
@@ -50,7 +50,7 @@
     "../../rtc_base:rtc_numerics",
     "../../system_wrappers",
     "../../system_wrappers:field_trial",
-    "../utility:utility",
+    "../utility",
   ]
 }
 
@@ -160,9 +160,9 @@
     "../../api/video:video_frame_i420",
     "../../api/video_codecs:video_codecs_api",
     "../../common_video",
+    "../../rtc_base",
     "../../rtc_base:checks",
     "../../rtc_base:deprecation",
-    "../../rtc_base:rtc_base",
     "../../rtc_base:rtc_base_approved",
     "../../rtc_base:rtc_numerics",
     "../../rtc_base:rtc_task_queue",
@@ -175,7 +175,7 @@
     "../../rtc_base/time:timestamp_extrapolator",
     "../../system_wrappers",
     "../rtp_rtcp:rtp_rtcp_format",
-    "../utility:utility",
+    "../utility",
     "//third_party/abseil-cpp/absl/container:inlined_vector",
     "//third_party/abseil-cpp/absl/types:optional",
     "//third_party/abseil-cpp/absl/types:variant",
@@ -196,8 +196,8 @@
     "../..:webrtc_common",
     "../../api/video:video_frame",
     "../../api/video_codecs:video_codecs_api",
-    "../../common_video:common_video",
-    "../../common_video/generic_frame_descriptor:generic_frame_descriptor",
+    "../../common_video",
+    "../../common_video/generic_frame_descriptor",
     "//third_party/abseil-cpp/absl/types:optional",
   ]
 }
@@ -286,8 +286,8 @@
     "../../api/video_codecs:video_codecs_api",
     "../../media:rtc_h264_profile_id",
     "../../media:rtc_media_base",
+    "../../rtc_base",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base",
     "../../rtc_base/system:rtc_export",
     "../../system_wrappers:metrics",
     "//third_party/abseil-cpp/absl/memory",
@@ -308,7 +308,7 @@
     ]
     deps += [
       "../../common_video",
-      "//third_party/ffmpeg:ffmpeg",
+      "//third_party/ffmpeg",
       "//third_party/openh264:encoder",
     ]
 
@@ -340,9 +340,9 @@
     "../../api/video:video_frame",
     "../../api/video:video_frame_i420",
     "../../api/video_codecs:video_codecs_api",
-    "../../common_video:common_video",
+    "../../common_video",
+    "../../rtc_base",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base",
     "../../system_wrappers",
     "../rtp_rtcp:rtp_rtcp_format",
   ]
@@ -470,8 +470,8 @@
     "../../common_video",
     "../../media:rtc_media_base",
     "../../media:rtc_vp9_profile",
+    "../../rtc_base",
     "../../rtc_base:checks",
-    "../../rtc_base:rtc_base",
     "../../rtc_base/experiments:rate_control_settings",
     "../../system_wrappers",
     "../../system_wrappers:field_trial",
@@ -545,7 +545,7 @@
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
       "../../api/video_codecs:video_codecs_api",
-      "../../common_video:common_video",
+      "../../common_video",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../test:test_support",
@@ -581,7 +581,7 @@
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
       "../../api/video_codecs:video_codecs_api",
-      "../../common_video:common_video",
+      "../../common_video",
       "../../rtc_base:checks",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_task_queue",
@@ -723,7 +723,7 @@
       "../../media:rtc_media_base",
       "../../media:rtc_simulcast_encoder_adapter",
       "../../media:rtc_vp9_profile",
-      "../../rtc_base:rtc_base",
+      "../../rtc_base",
       "../../test:field_trial",
       "../../test:fileutils",
       "../../test:test_support",
@@ -840,10 +840,10 @@
       "../../api/video:video_frame_i420",
       "../../api/video_codecs:video_codecs_api",
       "../../api/video_codecs:vp8_temporal_layers_factory",
-      "../../common_video:common_video",
+      "../../common_video",
       "../../media:rtc_media_base",
+      "../../rtc_base",
       "../../rtc_base:checks",
-      "../../rtc_base:rtc_base",
       "../../rtc_base:rtc_base_approved",
       "../../rtc_base:rtc_base_tests_utils",
       "../../rtc_base:rtc_numerics",
diff --git a/modules/video_processing/BUILD.gn b/modules/video_processing/BUILD.gn
index 84ce3b7..d488a46 100644
--- a/modules/video_processing/BUILD.gn
+++ b/modules/video_processing/BUILD.gn
@@ -108,7 +108,7 @@
       "../../api:scoped_refptr",
       "../../api/video:video_frame",
       "../../api/video:video_frame_i420",
-      "../../common_video:common_video",
+      "../../common_video",
       "../../test:fileutils",
       "../../test:test_support",
       "../../test:video_test_common",