[ros-diffs] [akhaldi] 53445: [NEWCC] * Fix rbuild build with NEWCC=0