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

Change-Id: Id03941575dfe6a06d0a1e3f1f69e43905e595a94