Merge "Add build targets for non-mainline NetworkStack" into qt-dev