Merge "ART: Rename heap support file"
am: 3dbf5c44fb

Change-Id: I4987beed6861e3efcec95a02ee25e5bce37564c1