Merge "Add build targets for non-mainline NetworkStack"