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

Change-Id: Iac8ca23ffbc220492ca82e16d8b7219aa6b6e071