Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into klp-dev am: c119a677c4
am: 35d1b45b0f

Change-Id: I0417ea58275604b9ac1fca6e79c14697d965397a