[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: 206f65e7 am: 2e104dad am: 5f7df2e8  -s ours am: f58a2b39  -s ours am: 244c2e8d am: 737d5f75 am: 3a3858f6  -s ours am: bc2cccfa am: ffe6090f7e am: 1d3b2c57 am: 081bea189d  -s ours
am: d1eb6bb1

Change-Id: I017086383136e5a16bc5328046781bc584043f6c