Merge "Fix TEMP_FAILURE_RETRY on non-GNU C++ dialects" am: addba34668

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2025446

Change-Id: I6a84e6300416c664f0b83dba77a5d7358873dbfe