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

Change-Id: I14d98d1df800f6197c5eb28a45bd9fe259c844bf