Merge "Add missing <sys/file.h> include for flock."