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
am: 9d449d48 -s ours
Change-Id: I3370b5bb190ab5c7749e729fefdec33f06523899