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

Change-Id: Icb8af84da7f44db49c0c463e137b5e944a58f319