Merge "Remove mk file parser variables that are no longer required by system/bt"
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