am 80e83972: am 9537ca80: Merge "adb: start-server and kill-server error output"

* commit '80e83972d0bce74d218f72b76339e6761ad6b03b':
  adb: start-server and kill-server error output