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