Merge "Fix the x86_64 fenv.h."