Merge "Fix non-aio USB read issue for fastbootd"
am: f777694081

Change-Id: I4491f78695be1f9073ecae99b2e34a2179b82bca