Merge "adb: fix `adb reverse` when adbd has multiple transports." into pi-dev