Merge change 20363 into donut

* changes:
  Make android.bat copy commons-compress to tmp with the other jar files.

tools/sdkmanager/app/etc/android.bat

@@ -46,6 +46,7 @@ if not "%1"=="" goto EndTempCopy
     copy /B /D /Y lib\androidprefs.jar   %tmpdir%\lib\       > nul
     copy /B /D /Y lib\org.eclipse.*      %tmpdir%\lib\       > nul
     copy /B /D /Y lib\sdk*               %tmpdir%\lib\       > nul
+    copy /B /D /Y lib\commons-compress*  %tmpdir%\lib\       > nul
 
     rem jarpath and swt_path are relative to PWD so we don't need to adjust them, just change dirs.
     set toolsdir=%cd%

tools/sdkmanager/libs/sdkuilib/src/com/android/sdkuilib/internal/repository/UpdaterData.java

@@ -308,7 +308,7 @@ class UpdaterData {
                         // Display anything unexpected in the monitor.
                         String msg = t.getMessage();
                         if (msg != null) {
-                            monitor.setResult("Unexpected Error installing '%1%s: %2$s",
+                            monitor.setResult("Unexpected Error installing '%1$s: %2$s",
                                     archive.getParentPackage().getShortDescription(), msg);
                         } else {
                             // no error info? get the stack call to display it