Merge "Create a SmokeTest runner that can collect extra debug info"