Merge "Don't use TEMP_FAILURE_RETRY on close in system/core."