DO NOT MERGE: adb: use asocket\\\\\\\\\\\\'s close function when closing. am: 5218ad36ad am: d7e24ec999 am: a3d96cfec9  -s ours am: 45a4bca09d  -s ours am: fb9747c411 am: dc6e14f219 am: fdf3112207  -s ours am: d389f5d186 am: 57f5c95376 am: 755ab3ed16 am: 46104a0d79  -s ours
am: 2dff6490fd

Change-Id: Ibae7110f3e755d504771227c23cd3615c3984b80