Merge "adb: make ctrl-c when spawning a daemon not kill the daemon."