Merge "Avoid triggering StrictMode when closing a socket." into lmp-dev