[automerger skipped] Merge "Fix non-aio USB read issue for fastbootd" am: f777694081
am: 9f69046bb7 -s ours
am skip reason: change_id I6690324840d78f3f1e04235040301520329976db with SHA1 5f8b966d96 is in history

Change-Id: I4d6ff4f5eacca55983ef3568eb49dc35e45f2c67