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

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