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

Change-Id: I3dfe0d1792b707e0ef5baf590ac1c9fa602e7240