Merge "services.net: Add a static library needed by wifi module" am: 488efe3350

Change-Id: I9088ccdec461145b16597d50834d231c9ea771d5