Merge "Remove extra/unneeded copy of fenv.h"