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

Change-Id: Ib7db891d5f23c2e9c7c0336d0414f092ea6caaa3