Merge "adb: fix old host transport selection." am: fd010252c2
am: 7b7448a418

Change-Id: I395f23b3f5c819ba22088cd1c6b79e85fcb5065b