Merge "Use the malloc debug heap dumper."
am: 0ec0c17596

Change-Id: I0f0d6a01a4a0d55f18e3f7b7ac7c64534d4b8f54