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

* commit 'cd82a6fea05d1fa06cb0ac56d2dbb27b013b8eaa':
  diskconfig: Add missing include for loff_t