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
am: 7a8b934ab5

Change-Id: I5c106da4673571bc24e17742ab62960333507f77