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

Change-Id: I779b0b79ce268561f4a686d6e98c131707464ecf