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

Change-Id: Ie81a6ff98883074401f44e1fda5528fe00d911aa