Merge "Build 64-bit host tools in Linux/Mac SDK build."
diff --git a/core/envsetup.mk b/core/envsetup.mk
index 962d269..0b68152 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -131,10 +131,6 @@
 $(error must be empty or one of: eng user userdebug)
 endif
 
-# Build host as 32-bit for SDK build.
-ifneq ($(filter $(MAKECMDGOALS),win_sdk sdk),)
-HOST_PREFER_32_BIT := true
-endif
 ifdef USE_MINGW
 # We only build sdk host tools in the MinGW windows build.
 # Build it as 32-bit as well.