Upgrade --target_environment, --auto_cpu_environment_group.

1: Allow both in the same build (before, just one would trigger)
2: Don't check environment defaults from other groups, since neither
   flag asserts any expectations on those groups
PiperOrigin-RevId: 178026699
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
index dca8074..008d137 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/BuildView.java
@@ -613,10 +613,8 @@
     }
 
     Set<ConfiguredTarget> targetsToSkip =
-        TopLevelConstraintSemantics.checkTargetEnvironmentRestrictions(
-            skyframeAnalysisResult.getConfiguredTargets(),
-            skyframeExecutor.getPackageManager(),
-            eventHandler);
+        new TopLevelConstraintSemantics(skyframeExecutor.getPackageManager(), eventHandler)
+            .checkTargetEnvironmentRestrictions(skyframeAnalysisResult.getConfiguredTargets());
 
     AnalysisResult result =
         createResult(