adb: use asocket\\\\'s close function when closing. am: f71c01493a am: d179556680 am: e2a5846402
am: 29aa08f8cc  -s ours

Change-Id: I0dc701f0946e066ecab854f99867057629b1ccc9