Merge "adb: properly handle libusb_clear_halt failure." am: 761ae04777
am: b44385f6b3

Change-Id: Iab2804f11c8052eeb4bf4f6aaa04ea7d35dcc0e0