Merge "adbd: when rebooting, don't close socket before pausing."