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

Change-Id: Iac5c5b2bb07505cde1638f42d5e1ae6566a88c0b