diff --git a/core/definitions.mk b/core/definitions.mk
index 2ad2b0405..883afda96 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -1265,11 +1265,12 @@ endef
 
 #TODO: use a smaller -Xmx value for most libraries;
 #      only core.jar and framework.jar need a heap this big.
+# Avoid the memory arguments on Windows, dx fails to load for some reason with them.
 define transform-classes.jar-to-dex
 @echo "target Dex: $(PRIVATE_MODULE)"
 @mkdir -p $(dir $@)
-$(hide) $(DX) -JXms16M \
-    -JXmx1536M \
+$(hide) $(DX) \
+    $(if $(findstring windows,$(HOST_OS)),,-JXms16M -JXmx1536M) \
     --dex --output=$@ \
     $(if $(NO_OPTIMIZE_DX), \
         --no-optimize) \
diff --git a/core/main.mk b/core/main.mk
index 878346128..8bd9c0d76 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -362,9 +362,6 @@ subdirs := \
 	external/qemu \
 	external/sqlite/dist \
 	external/zlib \
-	frameworks/base/libs/utils \
-	frameworks/base/tools/aapt \
-	frameworks/base/tools/aidl \
 	system/core/adb \
 	system/core/fastboot \
 	system/core/libcutils \
@@ -390,7 +387,6 @@ subdirs += \
 	development/tools/sdkmanager \
 	development/tools/mkstubs \
 	frameworks/base \
-	frameworks/base/tools/layoutlib \
 	external/googleclient \
 	packages
 else