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: c119a677 am: 35d1b45b am: dc0f9fa9  -s ours am: 8919cc83  -s ours am: 0241b6d8 am: 0fee65e5 am: 08fed21f  -s ours am: 0029d03c
am: afeaced4

Change-Id: I579d7384e9a12e942a0afcd80fc41e9f2877eedb