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

Change-Id: Ice5a255b0fe5a6ecc4fb9b8a669f65a1de990273