am bffa8906: am e73a8a23: Merge "win32: adb start-server shows stdout/stderr output from actual server"

* commit 'bffa890641de614668d3dafd8236e940f9ea6af7':
  win32: adb start-server shows stdout/stderr output from actual server