Merge "testrunner: Don't override env defaults" am: 1c959aa9b9
am: 4fd1ddb4b8

Change-Id: I23ec59ee3dd141d0c818e954759ab0490c508fc4