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

Change-Id: I2e6886d542bcaebe60473f306782fe3ab6f02130