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

* commit '30f9b5092062a0c8b61356496128feaaf8cd4237':
  libdiskconfig: Use uintptr_t instead of uint32_t