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

Change-Id: I96c46291cc73c021945c370c7bb33164bc0a3a0b