Merge "Dumpstate's netstat call should use -W."
am: 0708c8355f

Change-Id: If0d15f407cb5cd080950c414135a1ebcdf712d77