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

Change-Id: Ib220d4a778ea4e7bda44aafbbaa4911c243d7db7