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

* commit '9537ca803f86043212bfee13e8a13b7da2a9db59':
  adb: start-server and kill-server error output