am 8d592931: am 6a8b7b65: Merge "Don\'t use TEMP_FAILURE_RETRY on close()"

* commit '8d592931a1a45e99ef963abc0dffc895739ef7ec':
  Don't use TEMP_FAILURE_RETRY on close()