diff --git a/core/clear_vars.mk b/core/clear_vars.mk
index 02e574f..bae38c5 100644
--- a/core/clear_vars.mk
+++ b/core/clear_vars.mk
@@ -37,6 +37,8 @@
 LOCAL_COPY_TO_INTERMEDIATE_LIBRARIES:=
 LOCAL_CPP_EXTENSION:=
 LOCAL_CPPFLAGS:=
+LOCAL_CPP_STD:=
+LOCAL_C_STD:=
 LOCAL_CTS_TEST_PACKAGE:=
 LOCAL_CTS_TEST_RUNNER:=
 LOCAL_CXX:=
@@ -224,8 +226,6 @@
 LOCAL_WARNINGS_ENABLE:=
 LOCAL_WHOLE_STATIC_LIBRARIES:=
 LOCAL_YACCFLAGS:=
-LOCAL_C_STD:=
-LOCAL_CPP_STD:=
 OVERRIDE_BUILT_MODULE_PATH:=
 
 # arch specific variables
diff --git a/core/main.mk b/core/main.mk
index 6ec6e66..cca0d21 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -24,7 +24,8 @@
 	+@prebuilts/build-tools/$(host_prebuilts)/bin/makeparallel --ninja build/soong/soong_ui.bash --make-mode $(MAKECMDGOALS)
 
 .PHONY: $(MAKECMDGOALS)
-$(MAKECMDGOALS) : run_soong_ui
+$(sort $(MAKECMDGOALS)) : run_soong_ui
+	@#empty
 
 else # USE_SOONG_UI
 
diff --git a/core/soong_config.mk b/core/soong_config.mk
index d987254..ad2f204 100644
--- a/core/soong_config.mk
+++ b/core/soong_config.mk
@@ -67,9 +67,7 @@
 	echo ''; \
 	echo '    "ArtUseReadBarrier": $(if $(filter false,$(PRODUCT_ART_USE_READ_BARRIER)),false,true),'; \
 	echo ''; \
-	echo '    "BtConfigIncludeDir": "$(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)",'; \
-	echo '    "BtHcilpIncluded": "$(BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED)",'; \
-	echo '    "BtHciUseMct": $(if $(filter true,$(BLUETOOTH_HCI_USE_MCT)),true,false)'; \
+	echo '    "BtConfigIncludeDir": "$(BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR)"'; \
 	echo '}') > $(SOONG_VARIABLES_TMP); \
 	if ! cmp -s $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); then \
 	  mv $(SOONG_VARIABLES_TMP) $(SOONG_VARIABLES); \