[ros-diffs] [tkreuzer] 34863: put back rbuild files in a proper state, so x86 can be compiled again (as soon as someone fixed Interlocked stuff)