Merge "ART: Refactor run-test 913" am: 8d7f78d63b
am: ba4f9af969

Change-Id: I72839080c763f819a62ea7f6c442666d41981906