diff --git a/BoardConfig.mk b/BoardConfig.mk
index f1b2649..75bb56f 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -79,9 +79,8 @@ TARGET_KERNEL_HEADER_ARCH := arm64
 TARGET_KERNEL_CONFIG := sanders_defconfig
 TARGET_KERNEL_SOURCE := kernel/motorola/msm8953
 TARGET_KERNEL_CLANG_COMPILE := true
-TARGET_KERNEL_CLANG_PATH := $(PWD)/prebuilts/clang/host/$(HOST_OS)-x86/clang-5696680/bin
-TARGET_KERNEL_CLANG_VERSION := 9.0.5
-TARGET_USE_SDCLANG := true
+TARGET_KERNEL_CLANG_VERSION := r353983c
+#TARGET_USE_SDCLANG := true
 
 # Audio
 BOARD_SUPPORTS_SOUND_TRIGGER_HAL := true
@@ -276,7 +275,7 @@ WIFI_DRIVER_FW_PATH_P2P          := "p2p"
 WPA_SUPPLICANT_VERSION           := VER_0_8_X
 
 # Security patch level
-VENDOR_SECURITY_PATCH := 2019-04-01
+VENDOR_SECURITY_PATCH := 2019-06-01
 
 BOARD_ROOT_EXTRA_SYMLINKS := \
 	/vendor/firmware_mnt/image:firmware/image