[ros-diffs] [cgutman] 54831: [NDISUIO] - Build file fixes