am 1dc92bac: am 207c17ff: Merge "Make adb robust against EINTR"

* commit '1dc92bacb8cbf052438e0b1af4030a57901d6e94':
  Make adb robust against EINTR