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

Change-Id: I1e2ab174f62afc29db68a8f4c2778c17c0273e6d