[ros-diffs] [cwittich] 36943: fix advpack_winetest build