Merge "Copy junit-runner files into test-runner."