Merge "adb: fix `adb reverse` when adbd has multiple transports."
am: 2468b7623c

Change-Id: Idce1eedfa33a18c59e6edd62100934f7fe73dd08