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

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