Merge "ART: Clean up heap headers" am: aa97938605
am: cc7b98d118

Change-Id: I2caa85ba05bac01348c0e4b9aa555a7c28bb796e