am 1c4f64b5: am 1e80c294: [build] move dumpvar.mk include after select.mk include

Merge commit '1c4f64b59491eb8f3f7cb7b992a9fb06f2c475a1'

* commit '1c4f64b59491eb8f3f7cb7b992a9fb06f2c475a1':
  [build] move dumpvar.mk include after select.mk include
diff --git a/core/config.mk b/core/config.mk
index 3f72624..e8eef81 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -147,8 +147,6 @@
 TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk)))
 board_config_mk :=
 
-include $(BUILD_SYSTEM)/dumpvar.mk
-
 # Clean up/verify variables defined by the board config file.
 TARGET_BOOTLOADER_BOARD_NAME := $(strip $(TARGET_BOOTLOADER_BOARD_NAME))
 TARGET_CPU_ABI := $(strip $(TARGET_CPU_ABI))
@@ -356,3 +354,5 @@
     $(wildcard $(HISTORICAL_NDK_VERSIONS_ROOT)/android-ndk-r*)))
 
 INTERNAL_PLATFORM_API_FILE := $(TARGET_OUT_COMMON_INTERMEDIATES)/PACKAGING/public_api.xml
+
+include $(BUILD_SYSTEM)/dumpvar.mk