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

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