Merge "Support heap dumps generated with HotSpotDiagnosticMXBean" am: f3c3e83d3a
am: a217c1b3b6

Change-Id: Ia254f868ed63eb45725fc2d9747c1c124a0f9317