DO NOT MERGE: adb: use asocket\\\'s close function when closing. am: 83cb3032 -s ours am: 420aa30c am: 05d5db25 Change-Id: I433e885416a6cbf93bc701cfebc046f78a7af7dd