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

Change-Id: I357c754fe2bc3fdf4f050c26aace2bea4c6569c2