Code simplification in the environment, remove old incompatible flags

Remove --incompatible_static_name_resolution and --incompatible_package_name_is_a_function

#5827
#5637

RELNOTES: None.
PiperOrigin-RevId: 224140026
diff --git a/src/test/java/com/google/devtools/build/lib/syntax/ValidationTest.java b/src/test/java/com/google/devtools/build/lib/syntax/ValidationTest.java
index c8e1be5..ea58193 100644
--- a/src/test/java/com/google/devtools/build/lib/syntax/ValidationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/syntax/ValidationTest.java
@@ -133,13 +133,13 @@
 
   @Test
   public void testGlobalDefinedBelow() throws Exception {
-    env = newEnvironmentWithSkylarkOptions("--incompatible_static_name_resolution=true");
+    env = newEnvironmentWithSkylarkOptions();
     parse("def bar(): return x", "x = 5\n");
   }
 
   @Test
   public void testLocalVariableDefinedBelow() throws Exception {
-    env = newEnvironmentWithSkylarkOptions("--incompatible_static_name_resolution=true");
+    env = newEnvironmentWithSkylarkOptions();
     parse(
         "def bar():",
         "    for i in range(5):",