Update Benchmark and MeasurementSystem with population results (#1164)

* Adds population flags to Create Measurement including refactoring all
Event-specific flags under EventMeasurementParams
* Consolidates flags from MeasurementSystem and Benchmark in
CreateMeasurementFlags
* Fixes a bug in BenchmarkTest that wasn't actually returning the
correct result for each measurement and was verifying the wrong thing.
Note: This behavior still exists in MeasurementSystemTest but since we
aren't verifying any results, this seems unimportant to fix at this
time.

src/main/kotlin/org/wfanet/measurement/api/v2alpha/tools/BUILD.bazel

@@ -24,10 +24,25 @@ java_binary(
     runtime_deps = [":encryption_public_keys"],
 )
 
+kt_jvm_library(
+    name = "create_measurement_flags",
+    srcs = [
+        "CreateMeasurementFlags.kt",
+    ],
+    deps = [
+        "//src/main/proto/wfa/measurement/api/v2alpha:date_interval_kt_jvm_proto",
+        "//src/main/proto/wfa/measurement/api/v2alpha:measurement_spec_kt_jvm_proto",
+        "@wfa_common_jvm//imports/java/picocli",
+    ],
+)
+
 kt_jvm_library(
     name = "measurement_system",
-    srcs = ["MeasurementSystem.kt"],
+    srcs = [
+        "MeasurementSystem.kt",
+    ],
     deps = [
+        ":create_measurement_flags",
         "//src/main/kotlin/org/wfanet/measurement/api:account_constants",
         "//src/main/kotlin/org/wfanet/measurement/api:api_key_constants",
         "//src/main/kotlin/org/wfanet/measurement/api/v2alpha:resource_key",
@@ -82,8 +97,11 @@ java_binary(
 
 kt_jvm_library(
     name = "benchmark_library",
-    srcs = ["Benchmark.kt"],
+    srcs = [
+        "Benchmark.kt",
+    ],
     deps = [
+        ":create_measurement_flags",
         "//src/main/kotlin/org/wfanet/measurement/api:api_key_constants",
         "//src/main/kotlin/org/wfanet/measurement/api/v2alpha:resource_key",
         "//src/main/kotlin/org/wfanet/measurement/kingdom/deploy/common:flags",
@@ -95,6 +113,7 @@ kt_jvm_library(
         "//src/main/proto/wfa/measurement/api/v2alpha:measurement_consumers_service_kt_jvm_grpc_proto",
         "//src/main/proto/wfa/measurement/api/v2alpha:measurement_kt_jvm_proto",
         "//src/main/proto/wfa/measurement/api/v2alpha:measurements_service_kt_jvm_grpc_proto",
+        "//src/main/proto/wfa/measurement/api/v2alpha:model_line_kt_jvm_proto",
         "@wfa_common_jvm//imports/java/picocli",
         "@wfa_common_jvm//imports/kotlin/com/google/protobuf/kotlin",
         "@wfa_common_jvm//imports/kotlin/kotlinx/coroutines:core",