diff --git a/config/BUILDCONFIG.gn b/config/BUILDCONFIG.gn
index 668540579..942605e38 100644
--- a/config/BUILDCONFIG.gn
+++ b/config/BUILDCONFIG.gn
@@ -216,9 +216,9 @@ if (target_os == "android") {
   assert(host_os == "linux" || host_os == "mac",
          "Android builds are only supported on Linux and Mac hosts.")
   if (is_clang) {
-    _default_toolchain = "//build/toolchain/android:clang_$target_cpu"
+    _default_toolchain = "//build/toolchain/android:android_clang_$target_cpu"
   } else {
-    _default_toolchain = "//build/toolchain/android:$target_cpu"
+    _default_toolchain = "//build/toolchain/android:android_$target_cpu"
   }
 } else if (target_os == "chromeos" || target_os == "linux") {
   # See comments in build/toolchain/cros/BUILD.gn about board compiles.
diff --git a/config/android/config.gni b/config/android/config.gni
index 5dc4ff3e0..df64d400c 100644
--- a/config/android/config.gni
+++ b/config/android/config.gni
@@ -334,10 +334,10 @@ if (is_android) {
   if (defined(android_secondary_abi_cpu)) {
     if (is_clang) {
       android_secondary_abi_toolchain =
-          "//build/toolchain/android:clang_${android_secondary_abi_cpu}"
+          "//build/toolchain/android:android_clang_${android_secondary_abi_cpu}"
     } else {
       android_secondary_abi_toolchain =
-          "//build/toolchain/android:${android_secondary_abi_cpu}"
+          "//build/toolchain/android:android_${android_secondary_abi_cpu}"
     }
   }
 }
diff --git a/toolchain/android/BUILD.gn b/toolchain/android/BUILD.gn
index 917c46917..ad7b76278 100644
--- a/toolchain/android/BUILD.gn
+++ b/toolchain/android/BUILD.gn
@@ -70,12 +70,12 @@ template("android_gcc_toolchain") {
 }
 
 template("android_gcc_toolchains_helper") {
-  android_gcc_toolchain(target_name) {
+  android_gcc_toolchain("android_$target_name") {
     forward_variables_from(invoker, "*")
     toolchain_args.is_clang = false
   }
 
-  android_gcc_toolchain("clang_$target_name") {
+  android_gcc_toolchain("android_clang_$target_name") {
     forward_variables_from(invoker, "*")
     toolchain_args.is_clang = true
   }