Merge "adb: fix deadlock between transport_unref and usb_close." into oc-dr1-dev
am: 38eb25e157  -s ours

Change-Id: I029ddf455138b68118aa5eeb4178031c81f0a35f