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

Change-Id: I89e725f1e079d244dec377c15855a0b57ab7eef5