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

Change-Id: I6e5bb9fea57cf5fe9cff68952d6b2878ce005d7c