[ros-diffs] [khornicek] 49123: Fix amd64 build.