Reformat gn files

using
  git ls-files | grep BUILD.gn | xargs gn format
which seems to induce a shorter notation for cases like
-  "../../api/rtc_event_log:rtc_event_log",
+  "../../api/rtc_event_log",
now.

Bug: None
Change-Id: I362627095f3d0391603d9f642d14fdadba58ca66
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/402860
Reviewed-by: Harald Alvestrand <hta@webrtc.org>
Commit-Queue: Philipp Hancke <phancke@meta.com>
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#45257}
diff --git a/api/BUILD.gn b/api/BUILD.gn
index d584d45..036a23c 100644
--- a/api/BUILD.gn
+++ b/api/BUILD.gn
@@ -233,7 +233,7 @@
     ":ref_count",
     ":rtc_error",
     ":scoped_refptr",
-    "rtc_event_log:rtc_event_log",
+    "rtc_event_log",
   ]
 }
 
@@ -1025,7 +1025,7 @@
     "../rtc_base:macromagic",
     "../rtc_base:threading",
     "../rtc_base/system:rtc_export",
-    "rtc_event_log:rtc_event_log",
+    "rtc_event_log",
   ]
 }
 
@@ -1051,7 +1051,7 @@
     "../rtc_base:checks",
     "../rtc_base:macromagic",
     "../rtc_base/synchronization:sequence_checker_internal",
-    "task_queue:task_queue",
+    "task_queue",
   ]
 }
 
@@ -1758,7 +1758,7 @@
     ":frame_transformer_interface",
     ":ref_count",
     ":scoped_refptr",
-    "../audio:audio",
+    "../audio",
     "../modules/rtp_rtcp",
     "../rtc_base:checks",
     "../rtc_base/system:rtc_export",
diff --git a/api/environment/BUILD.gn b/api/environment/BUILD.gn
index 1a21672..c0aeda9 100644
--- a/api/environment/BUILD.gn
+++ b/api/environment/BUILD.gn
@@ -40,8 +40,8 @@
     "../../rtc_base/system:rtc_export",
     "../../system_wrappers",
     "../rtc_event_log",
+    "../task_queue",
     "../task_queue:default_task_queue_factory",
-    "../task_queue:task_queue",
     "../transport:field_trial_based_config",
     "//third_party/abseil-cpp/absl/base:nullability",
   ]
diff --git a/api/task_queue/test/BUILD.gn b/api/task_queue/test/BUILD.gn
index 65a590f..f1438c7 100644
--- a/api/task_queue/test/BUILD.gn
+++ b/api/task_queue/test/BUILD.gn
@@ -13,7 +13,7 @@
   sources = [ "mock_task_queue_base.h" ]
   deps = [
     "../..:location",
-    "../../../api/task_queue:task_queue",
+    "../../../api/task_queue",
     "../../../api/units:time_delta",
     "../../../test:test_support",
     "//third_party/abseil-cpp/absl/functional:any_invocable",
diff --git a/api/transport/BUILD.gn b/api/transport/BUILD.gn
index 11b0349..b99d403 100644
--- a/api/transport/BUILD.gn
+++ b/api/transport/BUILD.gn
@@ -140,7 +140,7 @@
       ":network_control",
       "..:simulated_network_api",
       "../../api:network_emulation_manager_api",
-      "../../api/rtc_event_log:rtc_event_log",
+      "../../api/rtc_event_log",
       "../units:data_rate",
       "../units:data_size",
       "../units:time_delta",
@@ -158,7 +158,7 @@
       ":network_control",
       ":test_feedback_generator_interface",
       "../../api:network_emulation_manager_api",
-      "../../api/rtc_event_log:rtc_event_log",
+      "../../api/rtc_event_log",
       "../../test/network:feedback_generator",
     ]
   }
diff --git a/api/video/BUILD.gn b/api/video/BUILD.gn
index 9e01662..e621f9c 100644
--- a/api/video/BUILD.gn
+++ b/api/video/BUILD.gn
@@ -207,11 +207,11 @@
     "..:array_view",
     "..:rtp_packet_info",
     "..:scoped_refptr",
-    "../../modules/rtp_rtcp:rtp_rtcp",
+    "../../modules/rtp_rtcp",
     "../../modules/rtp_rtcp:rtp_rtcp_format",
     "../../modules/rtp_rtcp:rtp_video_header",
+    "../../modules/video_coding",
     "../../modules/video_coding:packet_buffer",
-    "../../modules/video_coding:video_coding",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
     "../../rtc_base:rtc_numerics",
@@ -230,8 +230,8 @@
     ":video_frame",
     ":video_frame_type",
     "..:array_view",
+    "../../modules/rtp_rtcp",
     "../../modules/rtp_rtcp:rtp_packetizer_av1_test_helper",
-    "../../modules/rtp_rtcp:rtp_rtcp",
     "../../modules/rtp_rtcp:rtp_rtcp_format",
     "../../modules/rtp_rtcp:rtp_video_header",
     "../../modules/video_coding:codec_globals_headers",
@@ -252,7 +252,7 @@
       ":video_frame",
       ":video_frame_type",
       "..:array_view",
-      "../../modules/rtp_rtcp:rtp_rtcp",
+      "../../modules/rtp_rtcp",
       "../../modules/rtp_rtcp:rtp_rtcp_format",
       "../../modules/rtp_rtcp:rtp_video_header",
       "../../modules/video_coding:codec_globals_headers",
@@ -432,6 +432,6 @@
     "../../api/video:video_frame",
     "../../modules/video_coding:codec_globals_headers",
     "../../test:test_support",
-    "../../video:video",
+    "../../video",
   ]
 }
diff --git a/api/video_codecs/BUILD.gn b/api/video_codecs/BUILD.gn
index f21a8cf..eddc2b7 100644
--- a/api/video_codecs/BUILD.gn
+++ b/api/video_codecs/BUILD.gn
@@ -330,7 +330,7 @@
     "../../api/units:data_rate",
     "../../api/video_codecs:scalability_mode",
     "../../api/video_codecs:scalability_mode_helper",
-    "../../common_video/generic_frame_descriptor:generic_frame_descriptor",
+    "../../common_video/generic_frame_descriptor",
     "../../modules/video_coding/svc:scalability_structures",
     "../../modules/video_coding/svc:scalable_video_controller",
     "../../rtc_base:checks",
@@ -407,7 +407,7 @@
     "..:scoped_refptr",
     "../../api/video:video_frame",
     "../../api/video_codecs:video_codecs_api",
-    "../../common_video:common_video",
+    "../../common_video",
     "../../modules/video_coding/codecs/av1:dav1d_decoder",
     "../../rtc_base:checks",
     "../../rtc_base:logging",
diff --git a/audio/voip/test/BUILD.gn b/audio/voip/test/BUILD.gn
index 27ad573..05a3dac 100644
--- a/audio/voip/test/BUILD.gn
+++ b/audio/voip/test/BUILD.gn
@@ -14,7 +14,7 @@
     visibility = [ "*" ]
     sources = [ "mock_task_queue.h" ]
     deps = [
-      "../../../api/task_queue:task_queue",
+      "../../../api/task_queue",
       "../../../api/task_queue/test:mock_task_queue_base",
       "../../../test:test_support",
       "//third_party/abseil-cpp/absl/strings:string_view",
@@ -63,11 +63,11 @@
       "../../../api/audio_codecs:builtin_audio_encoder_factory",
       "../../../api/environment",
       "../../../api/environment:environment_factory",
-      "../../../api/task_queue:task_queue",
+      "../../../api/task_queue",
       "../../../api/voip:voip_api",
       "../../../modules/audio_mixer:audio_mixer_impl",
       "../../../modules/audio_mixer:audio_mixer_test_utils",
-      "../../../modules/rtp_rtcp:rtp_rtcp",
+      "../../../modules/rtp_rtcp",
       "../../../modules/rtp_rtcp:rtp_rtcp_format",
       "../../../rtc_base:logging",
       "../../../system_wrappers",
@@ -98,13 +98,13 @@
       "../../../api/units:time_delta",
       "../../../api/units:timestamp",
       "../../../modules/audio_mixer:audio_mixer_test_utils",
-      "../../../modules/rtp_rtcp:rtp_rtcp",
+      "../../../modules/rtp_rtcp",
       "../../../rtc_base:logging",
       "../../../rtc_base:rtc_event",
       "../../../test:mock_transport",
       "../../../test:run_loop",
       "../../../test:test_support",
-      "../../../test/time_controller:time_controller",
+      "../../../test/time_controller",
     ]
   }
 
@@ -126,14 +126,14 @@
       "../../../api/units:time_delta",
       "../../../api/units:timestamp",
       "../../../modules/audio_mixer:audio_mixer_test_utils",
-      "../../../modules/rtp_rtcp:rtp_rtcp",
+      "../../../modules/rtp_rtcp",
       "../../../modules/rtp_rtcp:rtp_rtcp_format",
       "../../../rtc_base:logging",
       "../../../rtc_base:rtc_event",
       "../../../test:mock_transport",
       "../../../test:run_loop",
       "../../../test:test_support",
-      "../../../test/time_controller:time_controller",
+      "../../../test/time_controller",
     ]
   }
 }
diff --git a/common_video/BUILD.gn b/common_video/BUILD.gn
index c6e8a07..04db2a7 100644
--- a/common_video/BUILD.gn
+++ b/common_video/BUILD.gn
@@ -193,7 +193,7 @@
       "../rtc_base:macromagic",
       "../rtc_base:rtc_base_tests_utils",
       "../rtc_base:timeutils",
-      "../system_wrappers:system_wrappers",
+      "../system_wrappers",
       "../test:fileutils",
       "../test:frame_utils",
       "../test:test_main",
diff --git a/examples/BUILD.gn b/examples/BUILD.gn
index 58c3dfc..6ec5e65 100644
--- a/examples/BUILD.gn
+++ b/examples/BUILD.gn
@@ -823,7 +823,7 @@
       "../rtc_base:socket_address",
       "../rtc_base:socket_server",
       "../rtc_base:threading",
-      "//third_party/abseil-cpp/absl/strings:strings",
+      "//third_party/abseil-cpp/absl/strings",
     ]
   }
   rtc_executable("stunserver") {
diff --git a/examples/androidvoip/BUILD.gn b/examples/androidvoip/BUILD.gn
index be28f08..657e7a7 100644
--- a/examples/androidvoip/BUILD.gn
+++ b/examples/androidvoip/BUILD.gn
@@ -79,7 +79,7 @@
       "//sdk/android:native_api_audio_device_module",
       "//sdk/android:native_api_base",
       "//sdk/android:native_api_jni",
-      "//third_party/abseil-cpp/absl/memory:memory",
+      "//third_party/abseil-cpp/absl/memory",
       "//third_party/jni_zero",
     ]
   }
diff --git a/logging/BUILD.gn b/logging/BUILD.gn
index 576980c..85d3db5 100644
--- a/logging/BUILD.gn
+++ b/logging/BUILD.gn
@@ -377,7 +377,7 @@
       "../api:array_view",
       "../api:candidate",
       "../api:dtls_transport_interface",
-      "../api/rtc_event_log:rtc_event_log",
+      "../api/rtc_event_log",
       "../api/transport:bandwidth_usage",
       "../api/units:timestamp",
       "../api/video:video_frame",
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 3c1647e..98a675a 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -726,8 +726,8 @@
       "../api:rtc_error",
       "../api:sequence_checker",
       "../api/environment",
+      "../api/task_queue",
       "../api/task_queue:pending_task_safety_flag",
-      "../api/task_queue:task_queue",
       "../api/transport:datagram_transport_interface",
       "../net/dcsctp/public:factory",
       "../net/dcsctp/public:socket",
@@ -748,9 +748,9 @@
       "../rtc_base:threading",
       "../rtc_base/containers:flat_map",
       "../rtc_base/network:received_packet",
-      "../rtc_base/third_party/sigslot:sigslot",
+      "../rtc_base/third_party/sigslot",
       "../system_wrappers",
-      "//third_party/abseil-cpp/absl/strings:strings",
+      "//third_party/abseil-cpp/absl/strings",
     ]
   }
 }
diff --git a/modules/async_audio_processing/BUILD.gn b/modules/async_audio_processing/BUILD.gn
index e09a22e..ba6bdea 100644
--- a/modules/async_audio_processing/BUILD.gn
+++ b/modules/async_audio_processing/BUILD.gn
@@ -20,7 +20,7 @@
     "../../api:sequence_checker",
     "../../api/audio:audio_frame_api",
     "../../api/audio:audio_frame_processor",
-    "../../api/task_queue:task_queue",
+    "../../api/task_queue",
     "../../rtc_base:checks",
     "../../rtc_base:refcount",
   ]
diff --git a/modules/audio_coding/BUILD.gn b/modules/audio_coding/BUILD.gn
index bce09e0..9649f0c 100644
--- a/modules/audio_coding/BUILD.gn
+++ b/modules/audio_coding/BUILD.gn
@@ -1056,7 +1056,7 @@
         "../../api:scoped_refptr",
         "../../api/audio_codecs:audio_codecs_api",
         "../../api/audio_codecs:builtin_audio_decoder_factory",
-        "../../api/environment:environment",
+        "../../api/environment",
         "../../api/neteq:neteq_api",
         "../../logging:rtc_event_log_parser",
         "../../rtc_base:checks",
diff --git a/modules/audio_device/BUILD.gn b/modules/audio_device/BUILD.gn
index 66f69fc..a26de6b 100644
--- a/modules/audio_device/BUILD.gn
+++ b/modules/audio_device/BUILD.gn
@@ -114,7 +114,7 @@
       "../../rtc_base:platform_thread_types",
       "../../rtc_base:stringutils",
       "../../rtc_base/win:windows_version",
-      "//third_party/abseil-cpp/absl/strings:strings",
+      "//third_party/abseil-cpp/absl/strings",
     ]
 
     libs = [ "oleaut32.lib" ]
@@ -159,7 +159,7 @@
       "../../rtc_base:timeutils",
       "../../rtc_base/win:scoped_com_initializer",
       "../../rtc_base/win:windows_version",
-      "//third_party/abseil-cpp/absl/strings:strings",
+      "//third_party/abseil-cpp/absl/strings",
     ]
   }
 }
diff --git a/modules/audio_processing/agc2/BUILD.gn b/modules/audio_processing/agc2/BUILD.gn
index 1581e49..83f8889 100644
--- a/modules/audio_processing/agc2/BUILD.gn
+++ b/modules/audio_processing/agc2/BUILD.gn
@@ -97,7 +97,7 @@
 
 rtc_library("clipping_predictor") {
   visibility = [
-    "../agc:agc",
+    "../agc",
     "./*",
   ]
 
@@ -181,7 +181,7 @@
 rtc_source_set("gain_map") {
   visibility = [
     "..:analog_mic_simulation",
-    "../agc:agc",
+    "../agc",
     "./*",
   ]
 
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index b93ed8c..b100541 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -762,7 +762,7 @@
 
       deps = [
         "../../api/video_codecs:video_codecs_api",
-        "../../modules/utility:utility",
+        "../../modules/utility",
         "../../rtc_base:checks",
         "../../sdk/android:internal_jni",
         "../../sdk/android:native_api_base",
@@ -869,7 +869,7 @@
       "../../api:videocodec_test_stats_api",
       "../../api/environment",
       "../../api/environment:environment_factory",
-      "../../api/numerics:numerics",
+      "../../api/numerics",
       "../../api/task_queue",
       "../../api/task_queue:default_task_queue_factory",
       "../../api/test/metrics:global_metrics_logger_and_exporter",
@@ -1329,8 +1329,8 @@
       "../../test:test_support",
       "../../test:video_test_common",
       "../../test:video_test_support",
-      "../../test/time_controller:time_controller",
-      "../../third_party/libyuv:libyuv",
+      "../../test/time_controller",
+      "../../third_party/libyuv",
       "../../video/config:encoder_config",
       "../rtp_rtcp",
       "../rtp_rtcp:rtp_rtcp_format",
diff --git a/modules/video_coding/timing/BUILD.gn b/modules/video_coding/timing/BUILD.gn
index ccd9ba0..ea1862f 100644
--- a/modules/video_coding/timing/BUILD.gn
+++ b/modules/video_coding/timing/BUILD.gn
@@ -149,8 +149,8 @@
     "../../../api/units:timestamp",
     "../../../rtc_base:histogram_percentile_counter",
     "../../../rtc_base:timeutils",
+    "../../../system_wrappers",
     "../../../system_wrappers:metrics",
-    "../../../system_wrappers:system_wrappers",
     "../../../test:create_test_field_trials",
     "../../../test:test_support",
   ]
diff --git a/net/dcsctp/fuzzers/BUILD.gn b/net/dcsctp/fuzzers/BUILD.gn
index 30e7e32..a79de79 100644
--- a/net/dcsctp/fuzzers/BUILD.gn
+++ b/net/dcsctp/fuzzers/BUILD.gn
@@ -12,7 +12,7 @@
   testonly = true
   deps = [
     "../../../api:array_view",
-    "../../../api/task_queue:task_queue",
+    "../../../api/task_queue",
     "../../../api/units:timestamp",
     "../../../rtc_base:checks",
     "../../../rtc_base:logging",
diff --git a/net/dcsctp/public/BUILD.gn b/net/dcsctp/public/BUILD.gn
index b7fbcf7..b42d53e 100644
--- a/net/dcsctp/public/BUILD.gn
+++ b/net/dcsctp/public/BUILD.gn
@@ -25,7 +25,7 @@
   deps = [
     ":types",
     "../../../api:array_view",
-    "../../../api/task_queue:task_queue",
+    "../../../api/task_queue",
     "../../../api/units:timestamp",
     "../../../rtc_base:checks",
     "../../../rtc_base:strong_alias",
diff --git a/net/dcsctp/rx/BUILD.gn b/net/dcsctp/rx/BUILD.gn
index 862b932..b2045ff 100644
--- a/net/dcsctp/rx/BUILD.gn
+++ b/net/dcsctp/rx/BUILD.gn
@@ -120,7 +120,7 @@
       ":reassembly_streams",
       ":traditional_reassembly_streams",
       "../../../api:array_view",
-      "../../../api/task_queue:task_queue",
+      "../../../api/task_queue",
       "../../../api/units:time_delta",
       "../../../api/units:timestamp",
       "../../../rtc_base:checks",
diff --git a/net/dcsctp/socket/BUILD.gn b/net/dcsctp/socket/BUILD.gn
index c6f1b4a..f410755 100644
--- a/net/dcsctp/socket/BUILD.gn
+++ b/net/dcsctp/socket/BUILD.gn
@@ -95,7 +95,7 @@
     ":packet_sender",
     ":stream_reset_handler",
     "../../../api:array_view",
-    "../../../api/task_queue:task_queue",
+    "../../../api/task_queue",
     "../../../api/units:time_delta",
     "../../../api/units:timestamp",
     "../../../rtc_base:checks",
@@ -135,7 +135,7 @@
     "../../../api:make_ref_counted",
     "../../../api:refcountedbase",
     "../../../api:scoped_refptr",
-    "../../../api/task_queue:task_queue",
+    "../../../api/task_queue",
     "../../../api/units:time_delta",
     "../../../api/units:timestamp",
     "../../../rtc_base:checks",
@@ -180,7 +180,7 @@
     sources = [ "mock_dcsctp_socket_callbacks.h" ]
     deps = [
       "../../../api:array_view",
-      "../../../api/task_queue:task_queue",
+      "../../../api/task_queue",
       "../../../api/units:time_delta",
       "../../../api/units:timestamp",
       "../../../rtc_base:logging",
diff --git a/net/dcsctp/timer/BUILD.gn b/net/dcsctp/timer/BUILD.gn
index 9346575..c33473d 100644
--- a/net/dcsctp/timer/BUILD.gn
+++ b/net/dcsctp/timer/BUILD.gn
@@ -11,7 +11,7 @@
 rtc_library("timer") {
   deps = [
     "../../../api:array_view",
-    "../../../api/task_queue:task_queue",
+    "../../../api/task_queue",
     "../../../api/units:time_delta",
     "../../../api/units:timestamp",
     "../../../rtc_base:checks",
@@ -35,8 +35,8 @@
     "../../../api:array_view",
     "../../../api:scoped_refptr",
     "../../../api:sequence_checker",
+    "../../../api/task_queue",
     "../../../api/task_queue:pending_task_safety_flag",
-    "../../../api/task_queue:task_queue",
     "../../../api/units:time_delta",
     "../../../api/units:timestamp",
     "../../../rtc_base:checks",
@@ -60,7 +60,7 @@
       ":task_queue_timeout",
       ":timer",
       "../../../api:array_view",
-      "../../../api/task_queue:task_queue",
+      "../../../api/task_queue",
       "../../../api/task_queue/test:mock_task_queue_base",
       "../../../api/units:time_delta",
       "../../../api/units:timestamp",
@@ -68,7 +68,7 @@
       "../../../rtc_base:gunit_helpers",
       "../../../rtc_base:threading",
       "../../../test:test_support",
-      "../../../test/time_controller:time_controller",
+      "../../../test/time_controller",
       "../public:socket",
       "../public:types",
     ]
diff --git a/net/dcsctp/tx/BUILD.gn b/net/dcsctp/tx/BUILD.gn
index da849ca..147bee6 100644
--- a/net/dcsctp/tx/BUILD.gn
+++ b/net/dcsctp/tx/BUILD.gn
@@ -176,7 +176,7 @@
       ":send_queue",
       ":stream_scheduler",
       "../../../api:array_view",
-      "../../../api/task_queue:task_queue",
+      "../../../api/task_queue",
       "../../../api/units:time_delta",
       "../../../api/units:timestamp",
       "../../../rtc_base:checks",
diff --git a/rtc_base/containers/BUILD.gn b/rtc_base/containers/BUILD.gn
index f80dfce..2e29c91 100644
--- a/rtc_base/containers/BUILD.gn
+++ b/rtc_base/containers/BUILD.gn
@@ -48,8 +48,8 @@
     ":flat_map",
     ":flat_set",
     "../../test:test_support",
-    "//testing/gmock:gmock",
-    "//testing/gtest:gtest",
+    "//testing/gmock",
+    "//testing/gtest",
     "//third_party/abseil-cpp/absl/algorithm:container",
     "//third_party/abseil-cpp/absl/strings:string_view",
   ]
diff --git a/rtc_base/task_utils/BUILD.gn b/rtc_base/task_utils/BUILD.gn
index 6a5db79..a5ef17a 100644
--- a/rtc_base/task_utils/BUILD.gn
+++ b/rtc_base/task_utils/BUILD.gn
@@ -25,7 +25,7 @@
     "../../api/task_queue:pending_task_safety_flag",
     "../../api/units:time_delta",
     "../../api/units:timestamp",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
     "//third_party/abseil-cpp/absl/functional:any_invocable",
   ]
 }
@@ -43,7 +43,7 @@
       "../../api/task_queue/test:mock_task_queue_base",
       "../../api/units:time_delta",
       "../../api/units:timestamp",
-      "../../system_wrappers:system_wrappers",
+      "../../system_wrappers",
       "../../test:test_support",
       "//third_party/abseil-cpp/absl/functional:any_invocable",
     ]
diff --git a/rtc_tools/BUILD.gn b/rtc_tools/BUILD.gn
index 9fbf777..12e06d6 100644
--- a/rtc_tools/BUILD.gn
+++ b/rtc_tools/BUILD.gn
@@ -212,11 +212,11 @@
       "../test:video_frame_writer",
       "../test:video_test_common",
       "../test:video_test_constants",
-      "../test/time_controller:time_controller",
+      "../test/time_controller",
       "//third_party/abseil-cpp/absl/flags:flag",
       "//third_party/abseil-cpp/absl/flags:parse",
+      "//third_party/abseil-cpp/absl/strings",
       "//third_party/abseil-cpp/absl/strings:str_format",
-      "//third_party/abseil-cpp/absl/strings:strings",
     ]
     if (build_with_chromium) {
       # When building from Chromium, WebRTC's metrics and field trial
@@ -315,7 +315,7 @@
         "../api/environment",
         "../api/environment:environment_factory",
         "../api/neteq:neteq_api",
-        "../api/rtc_event_log:rtc_event_log",
+        "../api/rtc_event_log",
         "../api/transport:bandwidth_usage",
         "../api/transport:ecn_marking",
         "../api/transport:goog_cc",
@@ -422,7 +422,7 @@
       "//api/video_codecs:builtin_video_decoder_factory",
       "//api/video_codecs:builtin_video_encoder_factory",
       "//api/video_codecs:video_codecs_api",
-      "//common_video:common_video",
+      "//common_video",
       "//media:media_constants",
       "//modules/video_coding:video_codec_interface",
       "//modules/video_coding:video_coding_utility",
@@ -433,7 +433,7 @@
       "//third_party/abseil-cpp/absl/flags:flag",
       "//third_party/abseil-cpp/absl/flags:parse",
       "//third_party/abseil-cpp/absl/flags:usage",
-      "//third_party/abseil-cpp/absl/strings:strings",
+      "//third_party/abseil-cpp/absl/strings",
     ]
   }
 }
diff --git a/test/BUILD.gn b/test/BUILD.gn
index b07102a..9edc60a 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -767,7 +767,7 @@
         "pc/e2e/analyzer/video/dvqa:dvqa_unittests",
         "peer_scenario/tests",
         "scenario:scenario_unittests",
-        "time_controller:time_controller",
+        "time_controller",
         "time_controller:time_controller_unittests",
         "//third_party/abseil-cpp/absl/flags:flag",
         "//third_party/abseil-cpp/absl/strings:string_view",
@@ -1370,7 +1370,7 @@
       ":native_test_jni",
       "//testing/gtest",
       "//third_party/abseil-cpp/absl/strings",
-      "//third_party/jni_zero:jni_zero",
+      "//third_party/jni_zero",
     ]
   }
 
@@ -1435,7 +1435,7 @@
     "../api:scoped_refptr",
     "../api/environment",
     "../api/environment:environment_factory",
-    "../api/numerics:numerics",
+    "../api/numerics",
     "../api/test/metrics:metric",
     "../api/test/metrics:metrics_logger",
     "../api/test/video:video_frame_writer",
diff --git a/test/network/BUILD.gn b/test/network/BUILD.gn
index f3c0ad6..d707ccf 100644
--- a/test/network/BUILD.gn
+++ b/test/network/BUILD.gn
@@ -199,9 +199,9 @@
       "../../api:network_emulation_manager_api",
       "../../api:rtp_parameters",
       "../../api:simulated_network_api",
-      "../../api/environment:environment",
+      "../../api/environment",
       "../../api/environment:environment_factory",
-      "../../api/rtc_event_log:rtc_event_log",
+      "../../api/rtc_event_log",
       "../../api/rtc_event_log:rtc_event_log_factory",
       "../../api/transport:network_control",
       "../../api/transport:test_feedback_generator_interface",
@@ -225,7 +225,7 @@
         "../../api:create_network_emulation_manager",
         "../../api:network_emulation_manager_api",
         "../../api:simulated_network_api",
-        "../../api/rtc_event_log:rtc_event_log",
+        "../../api/rtc_event_log",
         "../../api/transport:test_feedback_generator",
         "../../api/transport:test_feedback_generator_interface",
         "../../api/units:time_delta",
diff --git a/video/BUILD.gn b/video/BUILD.gn
index c1acd56..b9bbf1c 100644
--- a/video/BUILD.gn
+++ b/video/BUILD.gn
@@ -448,8 +448,8 @@
     "../api:sequence_checker",
     "../api/adaptation:resource_adaptation_api",
     "../api/environment",
+    "../api/task_queue",
     "../api/task_queue:pending_task_safety_flag",
-    "../api/task_queue:task_queue",
     "../api/units:data_rate",
     "../api/units:data_size",
     "../api/units:time_delta",
diff --git a/video/adaptation/BUILD.gn b/video/adaptation/BUILD.gn
index 1337140..389a11e 100644
--- a/video/adaptation/BUILD.gn
+++ b/video/adaptation/BUILD.gn
@@ -38,7 +38,7 @@
     "../../api:sequence_checker",
     "../../api/adaptation:resource_adaptation_api",
     "../../api/environment",
-    "../../api/task_queue:task_queue",
+    "../../api/task_queue",
     "../../api/units:data_rate",
     "../../api/units:data_size",
     "../../api/units:time_delta",
@@ -67,7 +67,7 @@
     "../../rtc_base/synchronization:mutex",
     "../../rtc_base/system:no_unique_address",
     "../../rtc_base/task_utils:repeating_task",
-    "../../system_wrappers:system_wrappers",
+    "../../system_wrappers",
     "../../video:video_stream_encoder_interface",
     "../../video/config:encoder_config",
     "//third_party/abseil-cpp/absl/algorithm:container",
@@ -96,7 +96,7 @@
       "../../api/adaptation:resource_adaptation_api",
       "../../api/environment",
       "../../api/environment:environment_factory",
-      "../../api/task_queue:task_queue",
+      "../../api/task_queue",
       "../../api/units:time_delta",
       "../../api/units:timestamp",
       "../../api/video:encoded_image",
@@ -119,7 +119,7 @@
       "../../rtc_base:timeutils",
       "../../test:rtc_expect_death",
       "../../test:test_support",
-      "../../test/time_controller:time_controller",
+      "../../test/time_controller",
       "../config:encoder_config",
       "//third_party/abseil-cpp/absl/functional:any_invocable",
     ]
diff --git a/video/corruption_detection/BUILD.gn b/video/corruption_detection/BUILD.gn
index 490f3ca..5aaa283 100644
--- a/video/corruption_detection/BUILD.gn
+++ b/video/corruption_detection/BUILD.gn
@@ -140,8 +140,8 @@
     "../../api:scoped_refptr",
     "../../api/video:video_frame",
     "../../rtc_base:checks",
+    "//third_party/abseil-cpp/absl/strings",
     "//third_party/abseil-cpp/absl/strings:string_view",
-    "//third_party/abseil-cpp/absl/strings:strings",
   ]
 }
 
diff --git a/video/render/BUILD.gn b/video/render/BUILD.gn
index 6b23583..3f49506 100644
--- a/video/render/BUILD.gn
+++ b/video/render/BUILD.gn
@@ -19,7 +19,7 @@
   deps = [
     ":video_render_frames",
     "../../api:sequence_checker",
-    "../../api/task_queue:task_queue",
+    "../../api/task_queue",
     "../../api/units:time_delta",
     "../../api/video:video_frame",
     "../../rtc_base:checks",