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

Change-Id: I5c106da4673571bc24e17742ab62960333507f77