Merge "adb: really make kill-server wait for server death"