Merge "ART: Make test 913-heaps more robust"
am: 6c8151ffa3

Change-Id: I9d79aa4d568dadf61d93f65b6e71bdf29052ae3e