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

Change-Id: Ie4d912fe979062b08f03e417ee7ec64636d812fd