Merge "adb: don't hardcode ports in test_adb."