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

Change-Id: Ibeae383dd6a926beeb1d453aa42d22d3837c6f95