Merge "[DO NOT MERGE] Prevent FDs from being leaked when accepted sockets are closed" into lmp-mr1-dev am: 447ac4b31d am: 4431d6cb5b am: 852e5a43b9  -s ours am: a70fffe8e7
am: d677e8d413

Change-Id: Ib333fdba81a5c339bc9b55fa3055a73a3b6042a7