Merge "adb: fix deadlock between transport_unref and usb_close." am: 6f61a6d9c4
am: 2a8ce10cd8

Change-Id: I3cce2167e58402732be09a3eb567cf0de3536f09