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

Change-Id: If122eee9334922f39a29ed0f2d543dec78e0661d