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

* commit '87948ca1c47eaa25d8957ce7884f4f1d5b1a01f6':
  diskconfig: Add missing include for loff_t