Merge "Make testrunner runnable from art directory"