[automerger skipped] Merge "Merge "Use the malloc debug heap dumper." am: 0ec0c17596 am: 84c9e9a787" into pi-dev-plus-aosp
am: da5fb6eac7  -s ours

Change-Id: If0cfb06266b5d75dc50d900117a154b94823853b