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

* commit '80da83ac31925326b3a76f10564c05f2043c70f0':
  diskconfig: Add missing include for loff_t