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

Change-Id: Ic594a48b7a99088420ce804c64a2930166544fda
diff --git a/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp b/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp
index 223c001..5ee9c3d 100644
--- a/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp
+++ b/libmeminfo/libdmabufinfo/tools/dmabuf_dump.cpp
@@ -105,7 +105,7 @@
 
     for (auto buf = bufs.begin(); buf != bufs.end(); ++buf) {
 
-        std::cout << ::android::base::StringPrintf("%16lu\t%10" PRIu64 "\t%lu\t",
+        std::cout << ::android::base::StringPrintf("%16lu\t%10" PRIu64 "\t%" PRIu64 "\t",
             buf->inode(),buf->size(), buf->count());
 
         memset(fds.get(), 0, sizeof(int) * pid_count);