Merge "Refresh include/sys/vfs.h"