Merge "adb: fix deadlock between transport_unref and usb_close." am: bb0d0245b3 am: 3d21fe7814
am: b01fe104e7

Change-Id: I94128840430281a54c74cdfb2b35744b4730942f