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

Change-Id: I3370b5bb190ab5c7749e729fefdec33f06523899