Merge "fastboot: remove retries on invalid IO iterator in OSX" am: be65e040 am: 7f72b30e

Original change: https://android-review.googlesource.com/c/platform/system/core/+/2631070



Change-Id: I3c76d40359933c767f6f5a25f6ac7c4fa4b03151
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>