am 36b1399d: Merge "diskconfig: Add missing include for loff_t"

* commit '36b1399d8cee09d4ffde3bf958322ab9556b8ebe':
  diskconfig: Add missing include for loff_t