Merge FIPS changes to VC-32 build system.