Merge "Allow testrunner to run test when inside ART directory"