am f37986e2: am 6ab10a1c: Merge "libdiskconfig: 64-bit issues"

* commit 'f37986e26bdf562196c4fc624a4f9d99aa171203':
  libdiskconfig: 64-bit issues