SDK Windows: Package customized proguard.bat scripts.

Requires Change: Ic1dc74cb3ff4dec9b419e2753290c361dffce48e
in platform/sdk.

Change-Id: Ieb2e308c0e9e655b2c047554563d753ac4cbb852
diff --git a/build/tools/make_windows_sdk.sh b/build/tools/make_windows_sdk.sh
index 97b3c64..9a61baf 100755
--- a/build/tools/make_windows_sdk.sh
+++ b/build/tools/make_windows_sdk.sh
@@ -172,7 +172,6 @@
     cp -v prebuilt/windows/swt/swt.jar         "$LIB"/x86/
     mkdir -pv "$LIB"/x86_64
     cp -v prebuilt/windows-x86_64/swt/swt.jar  "$LIB"/x86_64/
-    cp -v external/proguard/bin/*.bat          "$TOOLS"/proguard/bin/
 
     # Copy the SDK Manager (aka sdklauncher) to the root of the SDK (it was copied in tools above)
     # and move it also in SDK/tools/lib (so that tools updates can update the root one too)
@@ -196,6 +195,7 @@
     cp -v sdk/draw9patch/etc/draw9patch.bat                "$TOOLS"/
     cp -v sdk/sdkmanager/app/etc/android.bat               "$TOOLS"/
     cp -v sdk/monkeyrunner/etc/monkeyrunner.bat            "$TOOLS"/
+    cp -v sdk/files/proguard/bin/*.bat                     "$TOOLS"/proguard/bin/
 
     # Put the JetCreator tools, content and docs (not available in the linux SDK)
     JET="$TOOLS/Jet"
diff --git a/build/tools/patch_windows_sdk.sh b/build/tools/patch_windows_sdk.sh
index a6187fa..2d3c707 100755
--- a/build/tools/patch_windows_sdk.sh
+++ b/build/tools/patch_windows_sdk.sh
@@ -38,7 +38,6 @@
 cp $V ${TOPDIR}prebuilt/windows/swt/swt.jar         $LIB/x86/
 mkdir -pv $LIB/x86_64
 cp $V ${TOPDIR}prebuilt/windows-x86_64/swt/swt.jar  $LIB/x86_64/
-cp $V ${TOPDIR}external/proguard/bin/*.bat          $TOOLS/proguard/bin/
 
 # Copy the SDK Manager (aka sdklauncher) to the root of the SDK (it was copied in tools above)
 # and move it also in SDK/tools/lib (so that tools updates can update the root one too)
@@ -62,6 +61,7 @@
 cp $V ${TOPDIR}sdk/draw9patch/etc/draw9patch.bat                $TOOLS/
 cp $V ${TOPDIR}sdk/sdkmanager/app/etc/android.bat               $TOOLS/
 cp $V ${TOPDIR}sdk/monkeyrunner/etc/monkeyrunner.bat            $TOOLS/
+cp $V ${TOPDIR}sdk/files/proguard/bin/*.bat                     $TOOLS/proguard/bin/
 
 # Put the JetCreator tools, content and docs (not available in the linux SDK)
 JET=$TOOLS/Jet