DO NOT MERGE: adb: use asocket\\\\\\\'s close function when closing. am: db903737ef am: d7e24ec999 am: 88b3a871cf  -s ours am: eef25a068f  -s ours am: fd8cb9a879 am: dc6e14f219
am: a7698e353d  -s ours

Change-Id: I42711a1a41b8099df1b769eb1c4e1fbbd2ee78bf