Merge "Wrap TEMP_FAILURE_RETRY around system calls"