Merge "Remove unused HAVE_SOCKADDR_SA_LEN ifdef'd code"
am: 1d59671fd8

Change-Id: I877d2ce514630e9770dcd9bd8d6ad9c3c8eed8c7