[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: b33f167a am: de7ec225 am: 0067628f  -s ours am: d73901fd am: 1783182332 am: 3177c877 am: 8e172c638d  -s ours am: aa40fcb5 am: f012591c am: 45f6b5da am: b412f807af
am: 7ee566ec  -s ours

Change-Id: I6e3873fc1909739df0d76704f824fda8c1a65b6e