Merge "Add SocketUtils for NetworkStack" am: cec60fa56a
am: 27ae908282

Change-Id: I89fe62b4baf63104359bb6741807bb2f1666cdd9