Merge \"DO NOT MERGE: adb: use asocket\\\\\\\\\\\\\\'s close function when...

Merge \"DO NOT MERGE: adb: use asocket\\\\\\\\\\\\\\'s close function when closing. am: 5218ad36 am: d7e24ec9 am: a3d96cfe  -s ours am: 45a4bca0  -s ours am: fb9747c4 am: dc6e14f2 am: fdf31122  -s ours am: d389f5d1 am: 57f5c953 am: 755ab3ed am: 46104a0d  -s ours am: 2dff6490 am: 31fc3c3b\" into nyc-mr1-dev-plus-aosp
am: a1ddb6f5  -s ours

Change-Id: I5e129d5fbd3815fb3b50afc3151bc153eede14a3