Merge "libdiskconfig: Use uintptr_t instead of uint32_t"