diff --git a/build/sdk.atree b/build/sdk.atree
index 1c452e8e5..842a30e02 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -41,6 +41,7 @@ frameworks/base/docs/docs-redirect.html documentation.html
 bin/adb                                       platform-tools/adb
 bin/aapt                                      platform-tools/aapt
 bin/aidl                                      platform-tools/aidl
+bin/llvm-rs-cc                                platform-tools/llvm-rs-cc
 # dx
 bin/dx                                        platform-tools/dx
 bin/dexdump                                   platform-tools/dexdump
diff --git a/build/tools/patch_windows_sdk.sh b/build/tools/patch_windows_sdk.sh
index 3d9277acb..842fb47a1 100755
--- a/build/tools/patch_windows_sdk.sh
+++ b/build/tools/patch_windows_sdk.sh
@@ -56,11 +56,13 @@ LIB=$TEMP_SDK_DIR/tools/lib
 rm $V $TOOLS/{dmtracedump,etc1tool,hprof-conv,sqlite3,zipalign}
 rm $V $TOOLS/proguard/bin/*.sh
 rm $V $LIB/*/swt.jar
-rm $V $PLATFORM_TOOLS/{adb,aapt,aidl,dx,dexdump}
+rm $V $PLATFORM_TOOLS/{adb,aapt,aidl,dx,dexdump,llvm-rs-cc}
 
 # Copy all the new stuff in tools
 # Note: some tools are first copied here and then moved in platforms/<name>/tools/
 cp $V $WIN_OUT_DIR/host/windows-x86/bin/*.{exe,dll} $TOOLS/
+# Remove some tools we don't want to take in the SDK
+rm $V -f $TOOLS/{fastboot.exe,rs-spec-gen.exe,tblgen.exe}
 mkdir -pv $LIB/x86
 cp $V ${TOPDIR}prebuilt/windows/swt/swt.jar         $LIB/x86/
 mkdir -pv $LIB/x86_64
@@ -94,7 +96,9 @@ cp -r $V ${TOPDIR}external/sonivox/docs/JET_Creator_User_Manual_files  $JETDOC/
 
 # Copy or move platform specific tools to the default platform.
 cp $V ${TOPDIR}dalvik/dx/etc/dx.bat $PLATFORM_TOOLS/
-mv $V $TOOLS/{adb.exe,aapt.exe,aidl.exe,dexdump.exe} $TOOLS/Adb*.dll $PLATFORM_TOOLS/
+mv $V $TOOLS/{adb.exe,aapt.exe,aidl.exe,dexdump.exe} $PLATFORM_TOOLS/
+mv $V $TOOLS/llvm-rs-cc.exe $PLATFORM_TOOLS/
+mv $V $TOOLS/Adb*.dll $PLATFORM_TOOLS/
 
 # Fix EOL chars to make window users happy - fix all files at the top level
 # as well as all batch files including those in platforms/<name>/tools/
diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk
index 7a0443df5..6bf52fa8e 100644
--- a/build/tools/windows_sdk.mk
+++ b/build/tools/windows_sdk.mk
@@ -24,17 +24,28 @@ endif
 
 include $(TOPDIR)sdk/build/windows_sdk_tools.mk
 
+# This is the list of target that we want to generate as
+# Windows executables.
 WIN_TARGETS := \
 	aapt adb aidl \
 	etc1tool \
 	dexdump dmtracedump \
 	fastboot \
 	hprof-conv \
+	llvm-rs-cc \
 	prebuilt \
 	sqlite3 \
 	zipalign \
 	$(WIN_SDK_TARGETS)
 
+# This is the list of *Linux* build tools that we need
+# in order to be able to make the WIN_TARGETS. They are
+# build prerequisites.
+WIN_BUILD_PREREQ := \
+	acp \
+	llvm-rs-cc
+
+
 # LINUX_SDK_NAME/DIR is set in build/core/Makefile
 WIN_SDK_NAME  := $(subst $(HOST_OS)-$(HOST_ARCH),windows,$(LINUX_SDK_NAME))
 WIN_SDK_DIR   := $(subst $(HOST_OS)-$(HOST_ARCH),windows,$(LINUX_SDK_DIR))
@@ -63,7 +74,7 @@ endef
 win_sdk: $(WIN_SDK_ZIP)
 	$(call winsdk-banner,Done)
 
-winsdk-tools: acp
+winsdk-tools: $(WIN_BUILD_PREREQ)
 	$(call winsdk-banner,Build Windows Tools)
 	$(hide) USE_MINGW=1 $(MAKE) PRODUCT-$(TARGET_PRODUCT)-$(strip $(WIN_TARGETS))