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

Change-Id: Ibac1c6c001b40fc8d0563bbcbecd7e8a2f367e28