Merge "Remove unused HAVE_SOCKADDR_SA_LEN ifdef'd code"