am d25e1074: Merge "Don\'t use TEMP_FAILURE_RETRY on close in vold." into mnc-dev

* commit 'd25e10744026e85e86e22ace8ec939611be3f367':
  Don't use TEMP_FAILURE_RETRY on close in vold.