Index: compiler-rt/trunk/test/asan/CMakeLists.txt
===================================================================
--- compiler-rt/trunk/test/asan/CMakeLists.txt
+++ compiler-rt/trunk/test/asan/CMakeLists.txt
@@ -45,14 +45,8 @@
 endif()
 
 foreach(arch ${ASAN_TEST_ARCH})
-  if(ANDROID)
-    set(ASAN_TEST_TARGET_ARCH ${arch}-android)
-  else()
-    set(ASAN_TEST_TARGET_ARCH ${arch})
-  endif()
-
+  set(ASAN_TEST_TARGET_ARCH ${arch})
   set(ASAN_TEST_APPLE_PLATFORM "osx")
-
   string(TOLOWER "-${arch}-${OS_NAME}" ASAN_TEST_CONFIG_SUFFIX)
   get_bits_for_arch(${arch} ASAN_TEST_BITS)
   get_test_cc_for_arch(${arch} ASAN_TEST_TARGET_CC ASAN_TEST_TARGET_CFLAGS)
Index: compiler-rt/trunk/test/scudo/CMakeLists.txt
===================================================================
--- compiler-rt/trunk/test/scudo/CMakeLists.txt
+++ compiler-rt/trunk/test/scudo/CMakeLists.txt
@@ -15,15 +15,7 @@
 
 set(SCUDO_TEST_ARCH ${SCUDO_SUPPORTED_ARCH})
 foreach(arch ${SCUDO_TEST_ARCH})
-  if(ANDROID)
-    if (${arch} STREQUAL "i386")
-      set(SCUDO_TEST_TARGET_ARCH i686-android)
-    else()
-      set(SCUDO_TEST_TARGET_ARCH ${arch}-android)
-    endif()
-  else()
-    set(SCUDO_TEST_TARGET_ARCH ${arch})
-  endif()
+  set(SCUDO_TEST_TARGET_ARCH ${arch})
   string(TOLOWER "-${arch}" SCUDO_TEST_CONFIG_SUFFIX)
   get_test_cc_for_arch(${arch} SCUDO_TEST_TARGET_CC SCUDO_TEST_TARGET_CFLAGS)
   string(TOUPPER ${arch} ARCH_UPPER_CASE)