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 am: d99c745c31 am: 57b4b422e3 am: 96dea5690a  -s ours am: 2a9f4e1c50
am: 3d93063c14

Change-Id: Ic614220ad27d3acac4df2d2b0a06e82b888ebcbb