Merge "adb: use asocket's close function when closing."