[ros-diffs] [akhaldi] 48539: [CMAKE] - Improve advapi32 build.