[ros-diffs] [tkreuzer] 54938: [XDK] Fix build