[ros-diffs] [tkreuzer] 35948: fix hal build on x86