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

Change-Id: I433e885416a6cbf93bc701cfebc046f78a7af7dd