Merge "ART: Clean up test exec code" am: eb577ebe86
am: 02818c37a2

Change-Id: I455ddfc7d7f35f9d3cc17fc9b702f330c81c1c04