Merge changes Ib1510f36,I8a2f50da,Ife74d135,Idfb19903 am: 9427861d27
am: f86cf5eab5

* commit 'f86cf5eab5b2364769a1777df23ef8db1c1b82dc':
  Refactor TCP test code into its own file.
  Move some sock_diag tests around.
  Teach more sock_diag code and tests about mapped sockets.
  Delete the hack that finds mapped sockets.