Merge "testrunner: Don't override env defaults"