Merge "Reverting our test runner's background building behaviour."