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

Change-Id: I25a13f9c50acdf483129cb09b35ff0ec582ab55f