Merge "buildbot-build: Move the environment variable within the command." am: 9e70fafa am: 956bfd96 am: 670484a3 Change-Id: I1892308211181cb5941f6218a80a010467a2531f