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

Change-Id: I2124ed25893de9910be435ba68619dfc00e66239