Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4 am: 35d1b45b0f am: dc0f9fa9c9  -s ours am: 8919cc83bb  -s ours am: 0241b6d88a am: 0fee65e58b am: 08fed21f2c  -s ours am: 0029d03c0a am: afeaced48f am: 2a214fc5f2 am: 0ec10c8fdc  -s ours
am: 916552b0c9

Change-Id: I50571a7570a8f98d2e1b473694534ac478b060b7