DO NOT MERGE: adb: use asocket\\\'s close function when closing. am: 83cb3032d2  -s ours am: 420aa30c9f
am: 05d5db2534

Change-Id: I433e885416a6cbf93bc701cfebc046f78a7af7dd