Merge "Fix 32-bit dmabuf_dump build"
am: 2dcb4160fa

Change-Id: If2769548d19ae665d826d62ce02c9cd0cb23e93b