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

Change-Id: Ie36cec5292121754944626db5c615e42fc276102