am 65633b2b: Merge "Properly restore errno if NET_FAILURE_RETRY fails."

* commit '65633b2b8e3b2a56c6a50ed782d852c13ce19602':
  Properly restore errno if NET_FAILURE_RETRY fails.