Merge "Dump heap spaces for heap corruption"
am: a683248b80

Change-Id: I3f052d2b2d12a1dcc58ae1ba243132ba4b45deac