[ros-diffs] [tkreuzer] 44146: fix x86 build