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

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