[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed...

[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed am: 20d3b1f4  -s ours am: 3b193a23 am: a2497472 am: 04c877be  -s ours am: eac11939 am: 3d4c737736 am: 98af576c am: 90eafb5322  -s ours am: c9f07a5c am: 897b189c am: 9caba14c
am: b2e88d0cb9

Change-Id: Ib3de4e5ef9dd47e7b4bd070b7dfabd295e34e9ec