Merge "Clean up ConcurrentCloseTest#Killer"