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

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