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

Change-Id: I75e0e5a61d15b2e6c4a1fec70b807165c8768987