Merge "adb: start-server and kill-server error output"