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

Change-Id: I62721a8d4394ba9b776a372537e2541dbd718e7d