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

Change-Id: I036d7a2dadff14c46bc361a690e6df03c0922d01