adb: use asocket\\\\'s close function when closing. am: cc15e38bb8 am: 11e519e505 am: e2a5846402
am: f0f28d5391  -s ours

Change-Id: I0dc701f0946e066ecab854f99867057629b1ccc9