Merge "ART: Rename heap support file"