Merge "diskconfig: Add missing include for loff_t"