Merge changes I4a8aa840,I9708f2a3 am: 44b08c722d
am: fe07481ff9

* commit 'fe07481ff944cde33e6546579f83755000453e63':
  adb: check for an error response from adbd between each write.
  adbd: restore the old error handling behavior.