Merge "adb: fix deadlock in kick_all_transports." am: c2449e871e
am: b43479c764

Change-Id: Ic7b0b8bcc877f0a482b82280091f60b2f7ec673c