Merge "adb: Fix problems detecting adb in more complicated USB configurations."