Merge "Fix struct stat member types for x86-64."