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

Change-Id: I99042d0d5e68dfb0a9ae63e78c9974c1c8d90fa2