diff --git a/DEPS b/DEPS
index 1e245d421c..5106f5a733 100644
--- a/DEPS
+++ b/DEPS
@@ -402,6 +402,17 @@ deps = {
       'condition': 'checkout_android',
   },
 
+  'src/third_party/android_toolchain': {
+    'packages': [
+      {
+        'package': 'chromium/third_party/android_toolchain/r23c/android_toolchain',
+        'version': 'version:2@r23c.cr0',
+      },
+    ],
+    'condition': 'checkout_android',
+    'dep_type': 'cipd',
+  },
+
   'src/third_party/androidx': {
     'packages': [
       {
diff --git a/tools_webrtc/libs/generate_licenses.py b/tools_webrtc/libs/generate_licenses.py
index 2939af3f28..efec0156a8 100755
--- a/tools_webrtc/libs/generate_licenses.py
+++ b/tools_webrtc/libs/generate_licenses.py
@@ -36,6 +36,7 @@ LIB_TO_LICENSES_DICT = {
     'abseil-cpp': ['third_party/abseil-cpp/LICENSE'],
     'android_ndk': ['third_party/android_ndk/NOTICE'],
     'android_sdk': ['third_party/android_sdk/LICENSE'],
+    'android_toolchain': ['third_party/android_toolchain/NOTICE'],
     'auto': [
         'third_party/android_deps/libs/'
         'com_google_auto_service_auto_service/LICENSE'
diff --git a/tools_webrtc/presubmit_checks_lib/build_helpers.py b/tools_webrtc/presubmit_checks_lib/build_helpers.py
index 3386d6d40c..159160c2ff 100644
--- a/tools_webrtc/presubmit_checks_lib/build_helpers.py
+++ b/tools_webrtc/presubmit_checks_lib/build_helpers.py
@@ -81,6 +81,7 @@ def RunNinjaCommand(args, root_dir=None):
 def GetClangTidyPath():
   """POC/WIP! Use the one we have, even it doesn't match clang's version."""
   tidy = ('third_party/android_ndk/toolchains/'
+          'third_party/android_toolchain/toolchains/'
           'llvm/prebuilt/linux-x86_64/bin/clang-tidy')
   return os.path.join(SRC_DIR, tidy)