Merge "Don't use TEMP_FAILURE_RETRY with close in system/extras."