Merge "ART: Clean up test exec code"