Flip --incompatible_disable_legacy_crosstool_fields and --incompatib…

…le_disable_expand_if_all_available_in_flag_set

    Fixes #7008
    Fixes #6861

    This is an encore of bazelbuild/bazel@c18be0b.

    TESTED=https://buildkite.com/bazel/bazel-at-head-plus-downstream/builds/852#5c90f69e-c5d2-44c1-8067-0bde4cba6f6d (remote execution is fixed after syncing, verified locally)

    RELNOTES: `--incompatible_disable_legacy_crosstool_fields` has been flipped (bazelbuild/bazel#6861)
    `--incompatible_disable_expand_if_all_available_in_flag_set` has been flipped (bazelbuild/bazel#7008)
    PiperOrigin-RevId: 239567807

dataset/GitHub_Java/bazelbuild.bazel/src/main/java/com/google/devtools/build/lib/rules/cpp/CppOptions.java

@@ -707,20 +707,6 @@ public Label getFdoPrefetchHintsLabel() {
               + "(see https://github.com/bazelbuild/bazel/issues/7407 for more information).")
   public boolean dontEnableHostNonhost;
 
-  @Option(
-      name = "incompatible_require_ctx_in_configure_features",
-      defaultValue = "false",
-      documentationCategory = OptionDocumentationCategory.TOOLCHAIN,
-      effectTags = {OptionEffectTag.LOADING_AND_ANALYSIS},
-      metadataTags = {
-        OptionMetadataTag.INCOMPATIBLE_CHANGE,
-        OptionMetadataTag.TRIGGERED_BY_ALL_INCOMPATIBLE_CHANGES
-      },
-      help =
-          "If true, Bazel will require 'ctx' parameter in to cc_common.configure_features "
-              + "(see https://github.com/bazelbuild/bazel/issues/7793 for more information).")
-  public boolean requireCtxInConfigureFeatures;
-
   @Option(
       name = "incompatible_disable_legacy_crosstool_fields",
       oldName = "experimental_disable_legacy_crosstool_fields",
@@ -923,7 +909,6 @@ public FragmentOptions getHost() {
     host.enableCcToolchainResolution = enableCcToolchainResolution;
     host.removeLegacyWholeArchive = removeLegacyWholeArchive;
     host.dontEnableHostNonhost = dontEnableHostNonhost;
-    host.requireCtxInConfigureFeatures = requireCtxInConfigureFeatures;
     return host;
   }