Add layoutopt to the SDK.

Change-Id: Idc9b152e2a5abffaa9feb2cf70791d8288cfa1dd
diff --git a/build/sdk.atree b/build/sdk.atree
index 7a0ea0a..24ec73f 100644
--- a/build/sdk.atree
+++ b/build/sdk.atree
@@ -123,6 +123,12 @@
 framework/draw9patch.jar tools/lib/draw9patch.jar
 framework/swing-worker-1.1.jar tools/lib/swing-worker-1.1.jar
 
+# layoutopt
+bin/layoutopt tools/layoutopt
+framework/layoutopt.jar tools/lib/layoutopt.jar
+framework/uix.jar tools/lib/uix.jar
+framework/groovy-all-1.6.5.jar tools/lib/groovy-all-1.6.5.jar
+
 # traceview
 bin/traceview tools/traceview
 framework/traceview.jar tools/lib/traceview.jar
diff --git a/build/tools/make_windows_sdk.sh b/build/tools/make_windows_sdk.sh
index d694ea4..6ce2f43 100755
--- a/build/tools/make_windows_sdk.sh
+++ b/build/tools/make_windows_sdk.sh
@@ -141,7 +141,7 @@
     TOOLS="$TEMP_SDK_DIR/tools"
     LIB="$TEMP_SDK_DIR/tools/lib"
     rm -v "$TOOLS"/{adb,android,apkbuilder,ddms,dmtracedump,draw9patch,emulator}
-    rm -v "$TOOLS"/{hierarchyviewer,hprof-conv,mksdcard,sqlite3,traceview,zipalign}
+    rm -v "$TOOLS"/{hierarchyviewer,hprof-conv,layoutopt,mksdcard,sqlite3,traceview,zipalign}
     rm -v "$LIB"/*/swt.jar
     rm -v "$PLATFORM_TOOLS"/{aapt,aidl,dx,dexdump}
 
@@ -164,6 +164,7 @@
     cp -v development/tools/ddms/app/etc/ddms.bat                   "$TOOLS"/
     cp -v development/tools/traceview/etc/traceview.bat             "$TOOLS"/
     cp -v development/tools/hierarchyviewer/etc/hierarchyviewer.bat "$TOOLS"/
+    cp -v development/tools/layoutopt/etc/layoutopt.bat             "$TOOLS"/
     cp -v development/tools/draw9patch/etc/draw9patch.bat           "$TOOLS"/
     cp -v development/tools/sdkmanager/app/etc/android.bat          "$TOOLS"/