am 3278af85: am 30f9b509: Merge "libdiskconfig: Use uintptr_t instead of uint32_t"

* commit '3278af85f984a1b6df56b010a93589f6068514e0':
  libdiskconfig: Use uintptr_t instead of uint32_t