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

Change-Id: Ife4804a27b044aebaaefda6626adb61c241812af