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 am: 10926bc35e
am: 755ab3ed16

Change-Id: I43718396c291ac9cb261097f7a34cfa7c1fa3725