DO NOT MERGE: adb: use asocket\\\\\'s close function when closing. am: ddd7fd78ff  -s ours am: 381daa1ab7 am: 05d5db2534 am: a9551bb5e4  -s ours
am: ba783547a5

Change-Id: Ib220d4a778ea4e7bda44aafbbaa4911c243d7db7