diff --git a/build/tools/patch_windows_sdk.sh b/build/tools/patch_windows_sdk.sh
index 17424b7..49cb78c 100755
--- a/build/tools/patch_windows_sdk.sh
+++ b/build/tools/patch_windows_sdk.sh
@@ -6,7 +6,7 @@
 #   platform-dependent folders and files.
 # - sdk/build/patch_windows_sdk.sh to process folder and files which
 #   depend on the sdk.git repo. This file is invoked by the makefile
-#   at development/tools/build/windows_sdk.mk.
+#   at development/build/tools/windows_sdk.mk.
 #
 # Input arguments:
 # -q = Optional arg to make this silent. Must be given first.
@@ -59,10 +59,10 @@
 LIB=$TEMP_SDK_DIR/tools/lib
 rm $V $TOOLS/{dmtracedump,etc1tool,hprof-conv,sqlite3,zipalign}
 rm $V $LIB/*/swt.jar
-rm $V $PLATFORM_TOOLS/{adb,aapt,aidl,dx,dexdump,llvm-rs-cc}
+rm $V $PLATFORM_TOOLS/{adb,aapt,aidl,dx,dexdump,llvm-rs-cc,llvm-rs-cc-2}
 
 # Copy all the new stuff in tools
-# Note: some tools are first copied here and then moved in platforms/<name>/tools/
+# Note: some tools are first copied here and then moved in platform-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}
@@ -100,11 +100,14 @@
 # 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} $PLATFORM_TOOLS/
-mv $V $TOOLS/llvm-rs-cc.exe $PLATFORM_TOOLS/
 mv $V $TOOLS/Adb*.dll $PLATFORM_TOOLS/
+# The platform actually produces llvm-rs-cc-2 (via sdk.atree), whereas
+# the original version 1 (just named llvm-rs-cc) is stored in the prebuilts.
+cp $V ${TOPDIR}prebuilt/windows/llvm-rs-cc/llvm-rs-cc.exe $PLATFORM_TOOLS/llvm-rs-cc.exe
+mv $V $TOOLS/llvm-rs-cc.exe                               $PLATFORM_TOOLS/llvm-rs-cc-2.exe
 
 # 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/
+# as well as all batch files including those in platform-tools/
 if [[ -x $UNIX2DOS ]]; then
   find $TEMP_SDK_DIR -maxdepth 1 -name "*.[ht]*" -type f -print0 | xargs -0 $UNIX2DOS
   find $TEMP_SDK_DIR -maxdepth 3 -name "*.bat"   -type f -print0 | xargs -0 $UNIX2DOS
diff --git a/build/tools/windows_sdk.mk b/build/tools/windows_sdk.mk
index 8421a91..e259d29 100644
--- a/build/tools/windows_sdk.mk
+++ b/build/tools/windows_sdk.mk
@@ -85,6 +85,7 @@
 		$(TOPDIR)development/build/tools/patch_windows_sdk.sh $(subst @,-q,$(hide)) \
 		$(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR)
 	$(hide) strip --strip-all $(WIN_SDK_DIR)/$(WIN_SDK_NAME)/platform-tools/llvm-rs-cc.exe
+	$(hide) strip --strip-all $(WIN_SDK_DIR)/$(WIN_SDK_NAME)/platform-tools/llvm-rs-cc-2.exe
 	$(hide) $(TOPDIR)sdk/build/patch_windows_sdk.sh $(subst @,-q,$(hide)) \
 		$(WIN_SDK_DIR)/$(WIN_SDK_NAME) $(OUT_DIR) $(TOPDIR)
 	$(hide) ( \