Merge "Fix ConcurrentCloseTest's write test to ensure we're really blocked in write(2)."