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