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

Change-Id: I3cce2167e58402732be09a3eb567cf0de3536f09