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

Change-Id: Ic594a48b7a99088420ce804c64a2930166544fda