Index: buildbot_android_functions.sh
===================================================================
--- buildbot_android_functions.sh
+++ buildbot_android_functions.sh
@@ -89,7 +89,7 @@
   wait
   echo @@@BUILD_STEP build android/$_arch@@@
   ninja -C llvm_build_android_$_arch llvm-symbolizer || echo @@@STEP_FAILURE@@@
-  ninja -C compiler_rt_build_android_$_arch compiler-rt AsanUnitTests SanitizerUnitTests || echo @@@STEP_FAILURE@@@
+  ninja -C compiler_rt_build_android_$_arch || echo @@@STEP_FAILURE@@@
 }
 
 # If a multiarch device has x86 as the first arch, remove everything else from
@@ -177,8 +177,9 @@
   ANDROID_TOOLCHAIN=$ROOT/android_ndk/standalone-$_arch
   LIBCXX_SHARED=$(find $ANDROID_TOOLCHAIN/ -name libc++_shared.so | head -1)
   SYMBOLIZER_BIN=$ROOT/llvm_build_android_$_arch/bin/llvm-symbolizer
-  ASAN_RT=$(find $ROOT/llvm_build64/lib/ -name libclang_rt.asan-$_arch-android.so)
-  UBSAN_RT=$(find $ROOT/llvm_build64/lib/ -name libclang_rt.ubsan_standalone-$_arch-android.so)
+  RT_DIR=$ROOT/llvm_build64/lib/clang/*/lib/linux
+  # ASAN_RT=$(find $ROOT/llvm_build64/lib/ -name libclang_rt.asan-$_arch-android.so)
+  # UBSAN_RT=$(find $ROOT/llvm_build64/lib/ -name libclang_rt.ubsan_standalone-$_arch-android.so)
   COMPILER_RT_BUILD_DIR=$ROOT/compiler_rt_build_android_$_arch
   export ADB=adb
   export DEVICE_ROOT=/data/local/tmp/Output
@@ -195,8 +196,7 @@
   $ADB shell rm -rf $DEVICE_ROOT
   $ADB shell mkdir $DEVICE_ROOT
   $ADB push $SYMBOLIZER_BIN $DEVICE_ROOT/ &
-  $ADB push $ASAN_RT $DEVICE_ROOT/ &
-  $ADB push $UBSAN_RT $DEVICE_ROOT/ &
+  $ADB push "$RT_DIR/libclang_rt.*-android.so" $DEVICE_ROOT/ &
   $ADB push $LIBCXX_SHARED $DEVICE_ROOT/ &
   $ADB push $COMPILER_RT_BUILD_DIR/lib/sanitizer_common/tests/SanitizerTest $DEVICE_ROOT/ &
   $ADB push $COMPILER_RT_BUILD_DIR/lib/asan/tests/AsanTest $DEVICE_ROOT/ &
@@ -203,21 +203,9 @@
   $ADB push $COMPILER_RT_BUILD_DIR/lib/asan/tests/AsanNoinstTest $DEVICE_ROOT/ &
   wait
 
-  echo @@@BUILD_STEP run sanitizer lit tests [$DEVICE_DESCRIPTION]@@@
-  (cd $COMPILER_RT_BUILD_DIR && ninja check-sanitizer) || echo @@@STEP_FAILURE@@@
+  echo @@@BUILD_STEP run lit tests [$DEVICE_DESCRIPTION]@@@
+  (cd $COMPILER_RT_BUILD_DIR && ninja check-all) || echo @@@STEP_FAILURE@@@
 
-  echo @@@BUILD_STEP run asan lit tests [$DEVICE_DESCRIPTION]@@@
-  (cd $COMPILER_RT_BUILD_DIR && ninja check-asan) || echo @@@STEP_FAILURE@@@
-
-  echo @@@BUILD_STEP run ubsan lit tests [$DEVICE_DESCRIPTION]@@@
-  (cd $COMPILER_RT_BUILD_DIR && ninja check-ubsan) || echo @@@STEP_FAILURE@@@
-
-  echo @@@BUILD_STEP run cfi lit tests [$DEVICE_DESCRIPTION]@@@
-  (cd $COMPILER_RT_BUILD_DIR && ninja check-cfi) || echo @@@STEP_FAILURE@@@
-
-  echo @@@BUILD_STEP run scudo lit tests [$DEVICE_DESCRIPTION]@@@
-  (cd $COMPILER_RT_BUILD_DIR && ninja check-scudo) || echo @@@STEP_FAILURE@@@
-
   echo @@@BUILD_STEP run sanitizer_common tests [$DEVICE_DESCRIPTION]@@@
   run_command_on_device "LD_LIBRARY_PATH=$DEVICE_ROOT $DEVICE_ROOT/SanitizerTest" || echo @@@STEP_FAILURE@@@