diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp
index 5bfd71427ca7..179f0fd116b5 100644
--- a/clang/lib/Driver/ToolChains.cpp
+++ b/clang/lib/Driver/ToolChains.cpp
@@ -1094,7 +1094,6 @@ Generic_GCC::GCCInstallationDetector::GCCInstallationDetector(
     "i686-pc-linux-gnu",
     "i486-linux-gnu",
     "i386-linux-gnu",
-    "i686-linux-android",
     "i686-redhat-linux",
     "i586-redhat-linux",
     "i386-redhat-linux",
diff --git a/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/as b/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/as
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld b/clang/test/Driver/Inputs/basic_android_tree/arm-linux-androideabi/bin/ld
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/clang/test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/ar b/clang/test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/ar
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/clang/test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/ld b/clang/test/Driver/Inputs/basic_android_tree/i686-linux-android/bin/ld
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/clang/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/as b/clang/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/as
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/clang/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/ld b/clang/test/Driver/Inputs/basic_android_tree/mipsel-linux-android/bin/ld
deleted file mode 100755
index e69de29bb2d1..000000000000
diff --git a/clang/test/Driver/android.c b/clang/test/Driver/android.c
deleted file mode 100644
index cd61a19010ea..000000000000
--- a/clang/test/Driver/android.c
+++ /dev/null
@@ -1,21 +0,0 @@
-// Test Android Toolchain Detection
-
-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o \
-// RUN:     -target arm-linux-androideabi \
-// RUN:     -gcc-toolchain %S/Inputs/basic_android_tree 2>&1 \
-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-ARM %s
-// CHECK-ANDROID-ARM: "{{.*}}/Inputs/basic_android_tree/{{.*}}/arm-linux-androideabi/bin/as"
-// CHECK-ANDROID-ARM: "{{.*}}/Inputs/basic_android_tree/{{.*}}/arm-linux-androideabi/bin/ld"
-
-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o \
-// RUN:     -target mipsel-linux-android \
-// RUN:     -gcc-toolchain %S/Inputs/basic_android_tree 2>&1 \
-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-MIPS %s
-// CHECK-ANDROID-MIPS: "{{.*}}/Inputs/basic_android_tree/{{.*}}/mipsel-linux-android/bin/as"
-// CHECK-ANDROID-MIPS: "{{.*}}/Inputs/basic_android_tree/{{.*}}/mipsel-linux-android/bin/ld"
-
-// RUN: %clang -no-canonical-prefixes %s -### -o %t.o \
-// RUN:     -target i686-linux-android \
-// RUN:     -gcc-toolchain %S/Inputs/basic_android_tree 2>&1 \
-// RUN:   | FileCheck --check-prefix=CHECK-ANDROID-X86 %s
-// CHECK-ANDROID-X86: "{{.*}}/Inputs/basic_android_tree/{{.*}}/i686-linux-android/bin/ld"
diff --git a/clang/test/Driver/linux-ld.c b/clang/test/Driver/linux-ld.c
index c0ea45d5a8d6..06be3588600d 100644
--- a/clang/test/Driver/linux-ld.c
+++ b/clang/test/Driver/linux-ld.c
@@ -412,7 +412,7 @@
 // RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
 // RUN:   | FileCheck --check-prefix=CHECK-ANDROID %s
 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-// RUN:     -target i686-linux-android \
+// RUN:     -target i386-linux-android \
 // RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
 // RUN:   | FileCheck --check-prefix=CHECK-ANDROID %s
 // CHECK-ANDROID: "{{.*}}ld{{(.exe)?}}" "--sysroot=[[SYSROOT:[^"]+]]"
@@ -439,7 +439,7 @@
 // RUN:     -shared \
 // RUN:   | FileCheck --check-prefix=CHECK-ANDROID-SO %s
 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-// RUN:     -target i686-linux-android \
+// RUN:     -target i386-linux-android \
 // RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
 // RUN:     -shared \
 // RUN:   | FileCheck --check-prefix=CHECK-ANDROID-SO %s
@@ -468,7 +468,7 @@
 // RUN:     -static \
 // RUN:   | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-// RUN:     -target i686-linux-android \
+// RUN:     -target i386-linux-android \
 // RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
 // RUN:     -static \
 // RUN:   | FileCheck --check-prefix=CHECK-ANDROID-STATIC %s
@@ -496,7 +496,7 @@
 // RUN:     -pie \
 // RUN:   | FileCheck --check-prefix=CHECK-ANDROID-PIE %s
 // RUN: %clang -no-canonical-prefixes %s -### -o %t.o 2>&1 \
-// RUN:     -target i686-linux-android \
+// RUN:     -target i386-linux-android \
 // RUN:     --sysroot=%S/Inputs/basic_android_tree/sysroot \
 // RUN:     -pie \
 // RUN:   | FileCheck --check-prefix=CHECK-ANDROID-PIE %s