Merge "Revert "Remove unused net-module-utils-srcs filegroup.""