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

Change-Id: Ia44bef0d5dcb530ee17bcd7467f067ed1ef4b3cb