am 616f3680: am a7916509: Merge "Fix a TEMP_FAILURE_RETRY usage error in the linker."

* commit '616f368076c9d7f0fc4459b79ba26c1d1ec0a247':
  Fix a TEMP_FAILURE_RETRY usage error in the linker.