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

Change-Id: I6f8706228cc7b4243519cf23114287a431e96ea4