DO NOT MERGE: adb: use asocket\\\\'s close function when closing. am: ddd7fd78ff  -s ours am: 381daa1ab7 am: 05d5db2534
am: a9551bb5e4  -s ours

Change-Id: If7256035b8844a6567080b5caf769a0a4f567d2f