Merge "adb: fix forward --list, --remove(-all) with multiple devices."