DO NOT MERGE: adb: use asocket\\\\\\\'s close function when closing. am: ddd7fd78ff  -s ours am: 381daa1ab7 am: 05d5db2534 am: a9551bb5e4  -s ours am: ba783547a5 am: e80e7858d3
am: 57b4b422e3

Change-Id: I14d98d1df800f6197c5eb28a45bd9fe259c844bf