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 am: 73607db5a1 am: 05cd9942d9  -s ours am: 745254f98b am: d91f2f4d2b
am: c20376b2a0

Change-Id: I2e260246a45043ec46f9ffec2eb4147d310c7dc3