Merge "ART: Make run-test temp dir consistent"