Merge "adb: fix windows build after "forward --list" fix."