Merge "Make testrunner use an environment variable to control building."
am: 652aa2ee4d

Change-Id: Id2e91384685cd4a69af0b6216e86134e9a2ed7da