diff --git a/core/clang/config.mk b/core/clang/config.mk
index 03e8dd5b9..0c5e96379 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -1,6 +1,7 @@
 ## Clang configurations.
 
-LLVM_PREBUILTS_VERSION := 3.8
+LLVM_PREBUILTS_VERSION := 3.6
+FORCE_BUILD_SANITIZER_SHARED_OBJECTS := true
 LLVM_PREBUILTS_PATH := prebuilts/clang/host/$(BUILD_OS)-x86/$(LLVM_PREBUILTS_VERSION)/bin
 LLVM_RTLIB_PATH := $(LLVM_PREBUILTS_PATH)/../lib/clang/$(LLVM_PREBUILTS_VERSION)/lib/linux/
 
diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index df52e7204..718933854 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -84,7 +84,7 @@ ifneq ($(filter coverage,$(my_sanitize)),)
 endif
 
 ifneq ($(my_sanitize),)
-  fsanitize_arg := $(subst $(space),$(comma),$(my_sanitize))
+  fsanitize_arg := $(subst $(space),$(comma),$(my_sanitize)),
   my_cflags += -fsanitize=$(fsanitize_arg)
 
   ifdef LOCAL_IS_HOST_MODULE
@@ -92,10 +92,8 @@ ifneq ($(my_sanitize),)
     my_ldflags += -fsanitize=$(fsanitize_arg)
     my_ldlibs += -lrt -ldl
   else
-    ifeq ($(filter address,$(my_sanitize)),)
-      my_cflags += -fsanitize-trap=all
-      my_cflags += -ftrap-function=abort
-    endif
+    my_cflags += -fsanitize-undefined-trap-on-error
+    my_cflags += -ftrap-function=abort
     my_shared_libraries += libdl
   endif
 endif