Merge "ART: Change prebuild run-test setup"