[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: 27b3d578  -s ours am: 57fdbb97 am: 2cf025f9 am: 9c7ac981  -s ours am: 1448a693 am: 3d4c7377 am: f6d80377 am: 90eafb53  -s ours am: b2a1dcb9 am: 6ffdf43e am: 5fc21fdb
am: b2e88d0c

Change-Id: Ib3de4e5ef9dd47e7b4bd070b7dfabd295e34e9ec