DO NOT MERGE: adb: use asocket\\\'s close function when closing. am: db903737ef am: d7e24ec999
am: 88b3a871cf  -s ours

Change-Id: I4ca0f2890519c3450a15edab989ca424b6bb10ae