Merge "adb: Retry io in case of interrupt" am: 93e4501611
am: 2562dff11f

Change-Id: Ia73594c1544e3c4040eaaa71d27bed8869522370