Merge "Build test-runner/tests"