Merge "Fix 32-bit dmabuf_dump build"