Merge "ART: Make test 913-heaps more robust"