Merge "Fix TEMP_FAILURE_RETRY on non-GNU C++ dialects"