Merge "adb: fix old host transport selection."