Merge "Sort clear_vars.mk again" am: 05106468f8 am: 03b7efd871 am: dc59849984

am: b6deae08fe

Change-Id: I1a187a12738b13d5a86f7b171bb0f57b1909c7ff

core/clear_vars.mk

@@ -37,6 +37,8 @@ LOCAL_COPY_HEADERS_TO:=
 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:=
@@ -226,8 +228,6 @@ LOCAL_VTS_MODE:=
 LOCAL_WARNINGS_ENABLE:=
 LOCAL_WHOLE_STATIC_LIBRARIES:=
 LOCAL_YACCFLAGS:=
-LOCAL_C_STD:=
-LOCAL_CPP_STD:=
 OVERRIDE_BUILT_MODULE_PATH:=
 
 # arch specific variables