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

* commit '6a8b7b65f59452493423d9a56c7b3d4f1eedfd83':
  Don't use TEMP_FAILURE_RETRY on close()