Merge "Ensure <fcntl.h> defines the S_* constants from <sys/stat.h>."