diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk
index aaf8fa465..c4fcfa2b1 100644
--- a/build/tools/windows_sdk.mk
+++ b/build/tools/windows_sdk.mk
@@ -65,8 +65,8 @@ WIN_BUILD_PREREQ := \
 
 
 # MAIN_SDK_NAME/DIR is set in build/core/Makefile
-WIN_SDK_NAME := $(subst $(HOST_OS)-$(HOST_ARCH),windows,$(MAIN_SDK_NAME))
-WIN_SDK_DIR  := $(subst $(HOST_OS)-$(HOST_ARCH),windows,$(MAIN_SDK_DIR))
+WIN_SDK_NAME := $(subst $(HOST_OS)-$(SDK_HOST_ARCH),windows,$(MAIN_SDK_NAME))
+WIN_SDK_DIR  := $(subst $(HOST_OS)-$(SDK_HOST_ARCH),windows,$(MAIN_SDK_DIR))
 WIN_SDK_ZIP  := $(WIN_SDK_DIR)/$(WIN_SDK_NAME).zip
 
 $(call dist-for-goals, win_sdk, $(WIN_SDK_ZIP))
diff --git a/tools/elftree/Android.mk b/tools/elftree/Android.mk
index b1c1eb7ce..5f2849dcf 100644
--- a/tools/elftree/Android.mk
+++ b/tools/elftree/Android.mk
@@ -14,8 +14,8 @@
 
 LOCAL_PATH := $(call my-dir)
 
-supported_platforms := linux-x86
-cur_platform := $(filter $(HOST_OS)-$(HOST_ARCH),$(supported_platforms))
+supported_platforms := linux
+cur_platform := $(filter $(HOST_OS),$(supported_platforms))
 
 ifdef cur_platform