Merge "Remove HAVE_{BSD,SOLARIS}_NETWORK -only code" am: 4c5731d5f3
am: c39dd4ef04

Change-Id: I470daed791f6e4db6fe8239a0babcfe28c160e41