Merge "ahat: add support for parsing 0x0C HEAP DUMP record" am: 289c6c4008
am: ad34501f54

Change-Id: I0e9f19e853e01ec88d557c5c113eed49d2c25449