Merge "adb: add test for flushing socket data after a write failure." am: 32caa9870f am: aef43182dc
am: dede0946e2

Change-Id: I3d97f98ecea7f8669db4e65e9e80659966dd8b33