Merge changes I035cd9b6,I8ca9f205
am: 40fded7e6a

* commit '40fded7e6a300657d5f71f52a43d673a2f3f7446':
  Make the SOCK_DESTROY tests work again.
  Make CloseSocketFromFd work on mapped sockets too.