diff --git a/compiler-rt/test/lit.common.configured.in b/compiler-rt/test/lit.common.configured.in
--- a/compiler-rt/test/lit.common.configured.in
+++ b/compiler-rt/test/lit.common.configured.in
@@ -48,6 +48,11 @@
 
 if config.enable_per_target_runtime_dir:
   set_default("target_suffix", "")
+elif config.android:
+  if config.target_arch == "i386":
+    set_default("target_suffix", "-i686-android")
+  else:
+    set_default("target_suffix", "-%s-android" % config.target_arch)
 else:
   set_default("target_suffix", "-%s" % config.target_arch)