Merge "Fix the types of some of the struct stat fields."