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

Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: 0641d0f6 am: d889c8e7 am: 42161e25  -s ours am: 9d449d48  -s ours am: af877beb am: e8d29995 am: 276ff95f  -s ours am: 72afb582 am: afeaced48f am: b65fcfd9 am: 0ec10c8fdc  -s ours am: b630ddc4
am: 8f0db180

Change-Id: Ie644851845a7187f7062f1b6d616eb7bb6fd7308