[automerger skipped] Merge "Use the malloc debug heap dumper." am: 0ec0c17596 am: 84c9e9a787
am: 4d5ba2e496  -s ours

Change-Id: I4f1d4939e3b45b57dea8b8af2392501351e2b84b