Merge "adbd: fix a case where we can fail to join a thread."