Merge "Remove TEMP_FAILURE_RETRY for unlink" am: 7c06aef
am: c015f33

* commit 'c015f33a378fb816379cfbc2379f468e2af4e0ed':
  Remove TEMP_FAILURE_RETRY for unlink