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

Change-Id: Id22a1b5023dcbb8b8eeb6a7af70661eb91cdd035