am 4b7ddd61: Merge "Don\'t use TEMP_FAILURE_RETRY on close()" into mnc-dev

* commit '4b7ddd6105c44b01b473c5ed1035b6be34ba19e2':
  Don't use TEMP_FAILURE_RETRY on close()