Revert "Disable test 567 and 913 until fixed"

Revert submission 2147999-update-r8-4.0.18-dev

Reason for revert: Cause tests to fail. b/238666511
Reverted Changes:
I31c6aaf2c:Disable test 567 and 913 until fixed
Iabc76a0ee:Update D8 and R8 to 4.0.18-dev

Change-Id: I2146ebbbd417cbc6f2457bc33b31bfcc40dab672
diff --git a/TEST_MAPPING b/TEST_MAPPING
index 7293be7..5cbbd4c 100644
--- a/TEST_MAPPING
+++ b/TEST_MAPPING
@@ -905,6 +905,9 @@
       "name": "art-run-test-566-checker-codegen-select[com.google.android.art.apex]"
     },
     {
+      "name": "art-run-test-567-checker-builder-intrinsics[com.google.android.art.apex]"
+    },
+    {
       "name": "art-run-test-568-checker-onebit[com.google.android.art.apex]"
     },
     {
@@ -2212,6 +2215,9 @@
       "name": "art-run-test-566-checker-codegen-select"
     },
     {
+      "name": "art-run-test-567-checker-builder-intrinsics"
+    },
+    {
       "name": "art-run-test-568-checker-onebit"
     },
     {
@@ -3516,6 +3522,9 @@
       "name": "art-run-test-566-checker-codegen-select"
     },
     {
+      "name": "art-run-test-567-checker-builder-intrinsics"
+    },
+    {
       "name": "art-run-test-568-checker-onebit"
     },
     {
diff --git a/test/567-checker-builder-intrinsics/Android.bp b/test/567-checker-builder-intrinsics/Android.bp
index 2768bc9..5bf3c03 100644
--- a/test/567-checker-builder-intrinsics/Android.bp
+++ b/test/567-checker-builder-intrinsics/Android.bp
@@ -15,7 +15,7 @@
 java_test {
     name: "art-run-test-567-checker-builder-intrinsics",
     defaults: ["art-run-test-defaults"],
-    test_config_template: ":art-run-test-target-no-test-suite-tag-template",
+    test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
     data: [
         ":art-run-test-567-checker-builder-intrinsics-expected-stdout",
diff --git a/test/knownfailures.json b/test/knownfailures.json
index 4946cc1..8983d04 100644
--- a/test/knownfailures.json
+++ b/test/knownfailures.json
@@ -414,13 +414,6 @@
         "variant": "jvmti-stress | redefine-stress"
     },
     {
-        "tests": [ "567-checker-builder-intrinsics",
-                   "913-heaps" ],
-        "description": ["Problems with constant range."],
-        "bug": "http://b/238404145",
-        "variant": "optimizing | host"
-    },
-    {
         "test_patterns": ["[0-9]*-checker-.*"],
         "description": ["Checker tests are not compatible with jvmti."],
         "variant": "jvmti-stress | redefine-stress | trace-stress | field-stress | step-stress"
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index 6d1330c..481b9ba 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -159,7 +159,6 @@
   "497-inlining-and-class-loader",
   "530-regression-lse",
   "555-UnsafeGetLong-regression",
-  "567-checker-builder-intrinsics", # b/238404145
   # 596-monitor-inflation: Dependency on `libarttest`.
   "596-monitor-inflation",
   "602-deoptimizeable",
@@ -206,7 +205,6 @@
   "832-cha-recursive",
   # 837-deopt: Dependency on `libarttest`.
   "837-deopt",
-  "913-heaps", # b/238404145
 ])
 
 known_failing_on_hwasan_tests = frozenset([