Merge changes to build system from fips branch.