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 lmp-mr1-dev am: 5d50d79f am: 5c880142
am: 1fc2d0b1 -s ours
Change-Id: I2327ac15699e1734d4cf3ae4e1f7e8a5aedc0b5b