Merge "Clean up <sys/mount.h>/<linux/fs.h> duplication."