Merge "Add a -testdex variant for ART run-tests."