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: 0641d0f6 am: d889c8e7
am: 42161e25 -s ours
Change-Id: I75e0e5a61d15b2e6c4a1fec70b807165c8768987