am 9691ecc9: Merge "Remove extra/unneeded copy of fenv.h"

* commit '9691ecc9a768e7e08cb6af0b454029195ffc285f':
  Remove extra/unneeded copy of fenv.h