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 am: 2dcc64f6 am: d677e8d413 am: abc6ebd6 am: 05cd9942d9  -s ours am: 34cdf165 am: b2bc7e7e am: 3d8a007b am: 4a1b8d7aba
am: 0712ad0a  -s ours

Change-Id: Ic8449ba1aae1847a179d447b283d296e38862e89