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

Change-Id: Id42caaa08c4e933cf0d08bfe7c8271f2cdd40c76