Merge "Compile NetworkStack as system_current"