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

Change-Id: I35793a0332aaeb572a288d7806aed2bc43879dab