Merge "buildbot-build: Move the environment variable within the command."