commit a073f46104fbce0482fb759d5ccfb32ee39cc973
author Roland Levillain <rpl@google.com> Wed Oct 28 12:48:24 2020 +0000
committer Roland Levillain <rpl@google.com> Thu Nov 05 18:15:49 2020 +0000
tree 985538ce69fa4d9253725cddaca936ddc3eaea86
parent 5a19854c682a994729f704806d6c0de1de349631

Rename ART run-tests `expected.txt` files as `expected-stdout.txt`.

This is in preparation for the addition of `expected-stderr.txt` files
in all ART run-test directories, which will record the expected
standard error for each of these tests, and which will be verified
along with `expected-stdout.txt`.

Test: Run ART run-tests on host and device using `testrunner.py`.
Test: atest --test-mapping art:all
Bug: 171865375
Bug: 147812905
Change-Id: I37e3c4b8409475790e2fc63514cdf57156d47ff4

test/000-nop/expected-stdout.txt

diff --git a/test/000-nop/expected.txt b/test/000-nop/expected-stdout.txt
similarity index 100%
rename from test/000-nop/expected.txt
rename to test/000-nop/expected-stdout.txt

test/001-HelloWorld/Android.bp

diff --git a/test/001-HelloWorld/Android.bp b/test/001-HelloWorld/Android.bp
index 676b1d4..56883de 100644
--- a/test/001-HelloWorld/Android.bp
+++ b/test/001-HelloWorld/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-001-HelloWorld-expected"],
+    data: [":art-run-test-001-HelloWorld-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-001-HelloWorld-expected",
-    out: ["art-run-test-001-HelloWorld-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-001-HelloWorld-expected-stdout",
+    out: ["art-run-test-001-HelloWorld-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/001-HelloWorld/expected-stdout.txt

diff --git a/test/001-HelloWorld/expected.txt b/test/001-HelloWorld/expected-stdout.txt
similarity index 100%
rename from test/001-HelloWorld/expected.txt
rename to test/001-HelloWorld/expected-stdout.txt

test/001-Main/Android.bp

diff --git a/test/001-Main/Android.bp b/test/001-Main/Android.bp
index b7dc8ee..3f33fc0 100644
--- a/test/001-Main/Android.bp
+++ b/test/001-Main/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-001-Main-expected"],
+    data: [":art-run-test-001-Main-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-001-Main-expected",
-    out: ["art-run-test-001-Main-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-001-Main-expected-stdout",
+    out: ["art-run-test-001-Main-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/001-Main/expected-stdout.txt

diff --git a/test/001-Main/expected.txt b/test/001-Main/expected-stdout.txt
similarity index 100%
rename from test/001-Main/expected.txt
rename to test/001-Main/expected-stdout.txt

test/002-sleep/Android.bp

diff --git a/test/002-sleep/Android.bp b/test/002-sleep/Android.bp
index f3fe282..fb39bb6 100644
--- a/test/002-sleep/Android.bp
+++ b/test/002-sleep/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-002-sleep-expected"],
+    data: [":art-run-test-002-sleep-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-002-sleep-expected",
-    out: ["art-run-test-002-sleep-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-002-sleep-expected-stdout",
+    out: ["art-run-test-002-sleep-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/002-sleep/expected-stdout.txt

diff --git a/test/002-sleep/expected.txt b/test/002-sleep/expected-stdout.txt
similarity index 100%
rename from test/002-sleep/expected.txt
rename to test/002-sleep/expected-stdout.txt

test/003-omnibus-opcodes/expected-stdout.txt

diff --git a/test/003-omnibus-opcodes/expected.txt b/test/003-omnibus-opcodes/expected-stdout.txt
similarity index 100%
rename from test/003-omnibus-opcodes/expected.txt
rename to test/003-omnibus-opcodes/expected-stdout.txt

test/004-InterfaceTest/Android.bp

diff --git a/test/004-InterfaceTest/Android.bp b/test/004-InterfaceTest/Android.bp
index 85d1ee3..51fa5ea 100644
--- a/test/004-InterfaceTest/Android.bp
+++ b/test/004-InterfaceTest/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-004-InterfaceTest-expected"],
+    data: [":art-run-test-004-InterfaceTest-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-004-InterfaceTest-expected",
-    out: ["art-run-test-004-InterfaceTest-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-004-InterfaceTest-expected-stdout",
+    out: ["art-run-test-004-InterfaceTest-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/004-InterfaceTest/expected-stdout.txt

diff --git a/test/004-InterfaceTest/expected.txt b/test/004-InterfaceTest/expected-stdout.txt
similarity index 100%
rename from test/004-InterfaceTest/expected.txt
rename to test/004-InterfaceTest/expected-stdout.txt

test/004-JniTest/expected-stdout.txt

diff --git a/test/004-JniTest/expected.txt b/test/004-JniTest/expected-stdout.txt
similarity index 100%
rename from test/004-JniTest/expected.txt
rename to test/004-JniTest/expected-stdout.txt

test/004-NativeAllocations/expected-stdout.txt

diff --git a/test/004-NativeAllocations/expected.txt b/test/004-NativeAllocations/expected-stdout.txt
similarity index 100%
rename from test/004-NativeAllocations/expected.txt
rename to test/004-NativeAllocations/expected-stdout.txt

test/004-ReferenceMap/expected-stdout.txt

diff --git a/test/004-ReferenceMap/expected.txt b/test/004-ReferenceMap/expected-stdout.txt
similarity index 100%
rename from test/004-ReferenceMap/expected.txt
rename to test/004-ReferenceMap/expected-stdout.txt

test/004-SignalTest/Android.bp

diff --git a/test/004-SignalTest/Android.bp b/test/004-SignalTest/Android.bp
index cf0e4af..7eca5ec 100644
--- a/test/004-SignalTest/Android.bp
+++ b/test/004-SignalTest/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-004-SignalTest-expected"],
+    data: [":art-run-test-004-SignalTest-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-004-SignalTest-expected",
-    out: ["art-run-test-004-SignalTest-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-004-SignalTest-expected-stdout",
+    out: ["art-run-test-004-SignalTest-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/004-SignalTest/expected-stdout.txt

diff --git a/test/004-SignalTest/expected.txt b/test/004-SignalTest/expected-stdout.txt
similarity index 100%
rename from test/004-SignalTest/expected.txt
rename to test/004-SignalTest/expected-stdout.txt

test/004-StackWalk/expected-stdout.txt

diff --git a/test/004-StackWalk/expected.txt b/test/004-StackWalk/expected-stdout.txt
similarity index 100%
rename from test/004-StackWalk/expected.txt
rename to test/004-StackWalk/expected-stdout.txt

test/004-ThreadStress/expected-stdout.txt

diff --git a/test/004-ThreadStress/expected.txt b/test/004-ThreadStress/expected-stdout.txt
similarity index 100%
rename from test/004-ThreadStress/expected.txt
rename to test/004-ThreadStress/expected-stdout.txt

test/004-UnsafeTest/Android.bp

diff --git a/test/004-UnsafeTest/Android.bp b/test/004-UnsafeTest/Android.bp
index 6dd5af7..41bc73d 100644
--- a/test/004-UnsafeTest/Android.bp
+++ b/test/004-UnsafeTest/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-004-UnsafeTest-expected"],
+    data: [":art-run-test-004-UnsafeTest-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-004-UnsafeTest-expected",
-    out: ["art-run-test-004-UnsafeTest-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-004-UnsafeTest-expected-stdout",
+    out: ["art-run-test-004-UnsafeTest-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/004-UnsafeTest/expected-stdout.txt

diff --git a/test/004-UnsafeTest/expected.txt b/test/004-UnsafeTest/expected-stdout.txt
similarity index 100%
rename from test/004-UnsafeTest/expected.txt
rename to test/004-UnsafeTest/expected-stdout.txt

test/004-checker-UnsafeTest18/Android.bp

diff --git a/test/004-checker-UnsafeTest18/Android.bp b/test/004-checker-UnsafeTest18/Android.bp
index fb8c9c6..f163f2c 100644
--- a/test/004-checker-UnsafeTest18/Android.bp
+++ b/test/004-checker-UnsafeTest18/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-004-checker-UnsafeTest18-expected"],
+    data: [":art-run-test-004-checker-UnsafeTest18-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-004-checker-UnsafeTest18-expected",
-    out: ["art-run-test-004-checker-UnsafeTest18-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-004-checker-UnsafeTest18-expected-stdout",
+    out: ["art-run-test-004-checker-UnsafeTest18-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/004-checker-UnsafeTest18/expected-stdout.txt

diff --git a/test/004-checker-UnsafeTest18/expected.txt b/test/004-checker-UnsafeTest18/expected-stdout.txt
similarity index 100%
rename from test/004-checker-UnsafeTest18/expected.txt
rename to test/004-checker-UnsafeTest18/expected-stdout.txt

test/005-annotations/expected-stdout.txt

diff --git a/test/005-annotations/expected.txt b/test/005-annotations/expected-stdout.txt
similarity index 100%
rename from test/005-annotations/expected.txt
rename to test/005-annotations/expected-stdout.txt

test/006-args/Android.bp

diff --git a/test/006-args/Android.bp b/test/006-args/Android.bp
index 5bd2d1c..3d19e35 100644
--- a/test/006-args/Android.bp
+++ b/test/006-args/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-006-args-expected"],
+    data: [":art-run-test-006-args-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-006-args-expected",
-    out: ["art-run-test-006-args-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-006-args-expected-stdout",
+    out: ["art-run-test-006-args-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/006-args/expected-stdout.txt

diff --git a/test/006-args/expected.txt b/test/006-args/expected-stdout.txt
similarity index 100%
rename from test/006-args/expected.txt
rename to test/006-args/expected-stdout.txt

test/007-count10/Android.bp

diff --git a/test/007-count10/Android.bp b/test/007-count10/Android.bp
index 2f353b6..415ff2e 100644
--- a/test/007-count10/Android.bp
+++ b/test/007-count10/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-007-count10-expected"],
+    data: [":art-run-test-007-count10-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-007-count10-expected",
-    out: ["art-run-test-007-count10-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-007-count10-expected-stdout",
+    out: ["art-run-test-007-count10-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/007-count10/expected-stdout.txt

diff --git a/test/007-count10/expected.txt b/test/007-count10/expected-stdout.txt
similarity index 100%
rename from test/007-count10/expected.txt
rename to test/007-count10/expected-stdout.txt

test/008-exceptions/expected-stdout.txt

diff --git a/test/008-exceptions/expected.txt b/test/008-exceptions/expected-stdout.txt
similarity index 100%
rename from test/008-exceptions/expected.txt
rename to test/008-exceptions/expected-stdout.txt

test/009-instanceof/Android.bp

diff --git a/test/009-instanceof/Android.bp b/test/009-instanceof/Android.bp
index 2f97b0a..7878eb8 100644
--- a/test/009-instanceof/Android.bp
+++ b/test/009-instanceof/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-009-instanceof-expected"],
+    data: [":art-run-test-009-instanceof-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-009-instanceof-expected",
-    out: ["art-run-test-009-instanceof-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-009-instanceof-expected-stdout",
+    out: ["art-run-test-009-instanceof-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/009-instanceof/expected-stdout.txt

diff --git a/test/009-instanceof/expected.txt b/test/009-instanceof/expected-stdout.txt
similarity index 100%
rename from test/009-instanceof/expected.txt
rename to test/009-instanceof/expected-stdout.txt

test/010-instance/Android.bp

diff --git a/test/010-instance/Android.bp b/test/010-instance/Android.bp
index aac7532..d0064a2 100644
--- a/test/010-instance/Android.bp
+++ b/test/010-instance/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-010-instance-expected"],
+    data: [":art-run-test-010-instance-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-010-instance-expected",
-    out: ["art-run-test-010-instance-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-010-instance-expected-stdout",
+    out: ["art-run-test-010-instance-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/010-instance/expected-stdout.txt

diff --git a/test/010-instance/expected.txt b/test/010-instance/expected-stdout.txt
similarity index 100%
rename from test/010-instance/expected.txt
rename to test/010-instance/expected-stdout.txt

test/011-array-copy/Android.bp

diff --git a/test/011-array-copy/Android.bp b/test/011-array-copy/Android.bp
index 354efdd..378ccc4 100644
--- a/test/011-array-copy/Android.bp
+++ b/test/011-array-copy/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-011-array-copy-expected"],
+    data: [":art-run-test-011-array-copy-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-011-array-copy-expected",
-    out: ["art-run-test-011-array-copy-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-011-array-copy-expected-stdout",
+    out: ["art-run-test-011-array-copy-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/011-array-copy/expected-stdout.txt

diff --git a/test/011-array-copy/expected.txt b/test/011-array-copy/expected-stdout.txt
similarity index 100%
rename from test/011-array-copy/expected.txt
rename to test/011-array-copy/expected-stdout.txt

test/012-math/Android.bp

diff --git a/test/012-math/Android.bp b/test/012-math/Android.bp
index 0559944..77a5884 100644
--- a/test/012-math/Android.bp
+++ b/test/012-math/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-012-math-expected"],
+    data: [":art-run-test-012-math-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-012-math-expected",
-    out: ["art-run-test-012-math-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-012-math-expected-stdout",
+    out: ["art-run-test-012-math-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/012-math/expected-stdout.txt

diff --git a/test/012-math/expected.txt b/test/012-math/expected-stdout.txt
similarity index 100%
rename from test/012-math/expected.txt
rename to test/012-math/expected-stdout.txt

test/013-math2/Android.bp

diff --git a/test/013-math2/Android.bp b/test/013-math2/Android.bp
index 26d94fd..9a750ae 100644
--- a/test/013-math2/Android.bp
+++ b/test/013-math2/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-013-math2-expected"],
+    data: [":art-run-test-013-math2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-013-math2-expected",
-    out: ["art-run-test-013-math2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-013-math2-expected-stdout",
+    out: ["art-run-test-013-math2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/013-math2/expected-stdout.txt

diff --git a/test/013-math2/expected.txt b/test/013-math2/expected-stdout.txt
similarity index 100%
rename from test/013-math2/expected.txt
rename to test/013-math2/expected-stdout.txt

test/014-math3/Android.bp

diff --git a/test/014-math3/Android.bp b/test/014-math3/Android.bp
index 818cd3a..53f8ab2 100644
--- a/test/014-math3/Android.bp
+++ b/test/014-math3/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-014-math3-expected"],
+    data: [":art-run-test-014-math3-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-014-math3-expected",
-    out: ["art-run-test-014-math3-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-014-math3-expected-stdout",
+    out: ["art-run-test-014-math3-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/014-math3/expected-stdout.txt

diff --git a/test/014-math3/expected.txt b/test/014-math3/expected-stdout.txt
similarity index 100%
rename from test/014-math3/expected.txt
rename to test/014-math3/expected-stdout.txt

test/015-switch/Android.bp

diff --git a/test/015-switch/Android.bp b/test/015-switch/Android.bp
index b38c716..013fbca 100644
--- a/test/015-switch/Android.bp
+++ b/test/015-switch/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-015-switch-expected"],
+    data: [":art-run-test-015-switch-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-015-switch-expected",
-    out: ["art-run-test-015-switch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-015-switch-expected-stdout",
+    out: ["art-run-test-015-switch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/015-switch/expected-stdout.txt

diff --git a/test/015-switch/expected.txt b/test/015-switch/expected-stdout.txt
similarity index 100%
rename from test/015-switch/expected.txt
rename to test/015-switch/expected-stdout.txt

test/016-intern/Android.bp

diff --git a/test/016-intern/Android.bp b/test/016-intern/Android.bp
index 0bf003a..b6b7a8f 100644
--- a/test/016-intern/Android.bp
+++ b/test/016-intern/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-016-intern-expected"],
+    data: [":art-run-test-016-intern-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-016-intern-expected",
-    out: ["art-run-test-016-intern-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-016-intern-expected-stdout",
+    out: ["art-run-test-016-intern-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/016-intern/expected-stdout.txt

diff --git a/test/016-intern/expected.txt b/test/016-intern/expected-stdout.txt
similarity index 100%
rename from test/016-intern/expected.txt
rename to test/016-intern/expected-stdout.txt

test/017-float/Android.bp

diff --git a/test/017-float/Android.bp b/test/017-float/Android.bp
index 4b0dee7..d1678c1 100644
--- a/test/017-float/Android.bp
+++ b/test/017-float/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-017-float-expected"],
+    data: [":art-run-test-017-float-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-017-float-expected",
-    out: ["art-run-test-017-float-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-017-float-expected-stdout",
+    out: ["art-run-test-017-float-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/017-float/expected-stdout.txt

diff --git a/test/017-float/expected.txt b/test/017-float/expected-stdout.txt
similarity index 100%
rename from test/017-float/expected.txt
rename to test/017-float/expected-stdout.txt

test/018-stack-overflow/Android.bp

diff --git a/test/018-stack-overflow/Android.bp b/test/018-stack-overflow/Android.bp
index 1b1b42d..c0a2bdc 100644
--- a/test/018-stack-overflow/Android.bp
+++ b/test/018-stack-overflow/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-018-stack-overflow-expected"],
+    data: [":art-run-test-018-stack-overflow-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-018-stack-overflow-expected",
-    out: ["art-run-test-018-stack-overflow-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-018-stack-overflow-expected-stdout",
+    out: ["art-run-test-018-stack-overflow-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/018-stack-overflow/expected-stdout.txt

diff --git a/test/018-stack-overflow/expected.txt b/test/018-stack-overflow/expected-stdout.txt
similarity index 100%
rename from test/018-stack-overflow/expected.txt
rename to test/018-stack-overflow/expected-stdout.txt

test/019-wrong-array-type/Android.bp

diff --git a/test/019-wrong-array-type/Android.bp b/test/019-wrong-array-type/Android.bp
index c629a66..e756088 100644
--- a/test/019-wrong-array-type/Android.bp
+++ b/test/019-wrong-array-type/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-019-wrong-array-type-expected"],
+    data: [":art-run-test-019-wrong-array-type-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-019-wrong-array-type-expected",
-    out: ["art-run-test-019-wrong-array-type-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-019-wrong-array-type-expected-stdout",
+    out: ["art-run-test-019-wrong-array-type-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/019-wrong-array-type/expected-stdout.txt

diff --git a/test/019-wrong-array-type/expected.txt b/test/019-wrong-array-type/expected-stdout.txt
similarity index 100%
rename from test/019-wrong-array-type/expected.txt
rename to test/019-wrong-array-type/expected-stdout.txt

test/020-string/Android.bp

diff --git a/test/020-string/Android.bp b/test/020-string/Android.bp
index 7689db6..cd6617e 100644
--- a/test/020-string/Android.bp
+++ b/test/020-string/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-020-string-expected"],
+    data: [":art-run-test-020-string-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-020-string-expected",
-    out: ["art-run-test-020-string-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-020-string-expected-stdout",
+    out: ["art-run-test-020-string-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/020-string/expected-stdout.txt

diff --git a/test/020-string/expected.txt b/test/020-string/expected-stdout.txt
similarity index 100%
rename from test/020-string/expected.txt
rename to test/020-string/expected-stdout.txt

test/021-string2/Android.bp

diff --git a/test/021-string2/Android.bp b/test/021-string2/Android.bp
index b4c3d47..725fdd8 100644
--- a/test/021-string2/Android.bp
+++ b/test/021-string2/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-021-string2-expected"],
+    data: [":art-run-test-021-string2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-021-string2-expected",
-    out: ["art-run-test-021-string2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-021-string2-expected-stdout",
+    out: ["art-run-test-021-string2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/021-string2/expected-stdout.txt

diff --git a/test/021-string2/expected.txt b/test/021-string2/expected-stdout.txt
similarity index 100%
rename from test/021-string2/expected.txt
rename to test/021-string2/expected-stdout.txt

test/022-interface/Android.bp

diff --git a/test/022-interface/Android.bp b/test/022-interface/Android.bp
index ea8648d..eefa63b 100644
--- a/test/022-interface/Android.bp
+++ b/test/022-interface/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-022-interface-expected"],
+    data: [":art-run-test-022-interface-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-022-interface-expected",
-    out: ["art-run-test-022-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-022-interface-expected-stdout",
+    out: ["art-run-test-022-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/022-interface/expected-stdout.txt

diff --git a/test/022-interface/expected.txt b/test/022-interface/expected-stdout.txt
similarity index 100%
rename from test/022-interface/expected.txt
rename to test/022-interface/expected-stdout.txt

test/023-many-interfaces/expected-stdout.txt

diff --git a/test/023-many-interfaces/expected.txt b/test/023-many-interfaces/expected-stdout.txt
similarity index 100%
rename from test/023-many-interfaces/expected.txt
rename to test/023-many-interfaces/expected-stdout.txt

test/024-illegal-access/expected-stdout.txt

diff --git a/test/024-illegal-access/expected.txt b/test/024-illegal-access/expected-stdout.txt
similarity index 100%
rename from test/024-illegal-access/expected.txt
rename to test/024-illegal-access/expected-stdout.txt

test/025-access-controller/Android.bp

diff --git a/test/025-access-controller/Android.bp b/test/025-access-controller/Android.bp
index aca7ccf..a94ef64 100644
--- a/test/025-access-controller/Android.bp
+++ b/test/025-access-controller/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-025-access-controller-expected"],
+    data: [":art-run-test-025-access-controller-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-025-access-controller-expected",
-    out: ["art-run-test-025-access-controller-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-025-access-controller-expected-stdout",
+    out: ["art-run-test-025-access-controller-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/025-access-controller/expected-stdout.txt

diff --git a/test/025-access-controller/expected.txt b/test/025-access-controller/expected-stdout.txt
similarity index 100%
rename from test/025-access-controller/expected.txt
rename to test/025-access-controller/expected-stdout.txt

test/026-access/Android.bp

diff --git a/test/026-access/Android.bp b/test/026-access/Android.bp
index ae74b13..1e7c852 100644
--- a/test/026-access/Android.bp
+++ b/test/026-access/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-026-access-expected"],
+    data: [":art-run-test-026-access-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-026-access-expected",
-    out: ["art-run-test-026-access-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-026-access-expected-stdout",
+    out: ["art-run-test-026-access-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/026-access/expected-stdout.txt

diff --git a/test/026-access/expected.txt b/test/026-access/expected-stdout.txt
similarity index 100%
rename from test/026-access/expected.txt
rename to test/026-access/expected-stdout.txt

test/027-arithmetic/Android.bp

diff --git a/test/027-arithmetic/Android.bp b/test/027-arithmetic/Android.bp
index ddf456a..d0c4446 100644
--- a/test/027-arithmetic/Android.bp
+++ b/test/027-arithmetic/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-027-arithmetic-expected"],
+    data: [":art-run-test-027-arithmetic-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-027-arithmetic-expected",
-    out: ["art-run-test-027-arithmetic-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-027-arithmetic-expected-stdout",
+    out: ["art-run-test-027-arithmetic-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/027-arithmetic/expected-stdout.txt

diff --git a/test/027-arithmetic/expected.txt b/test/027-arithmetic/expected-stdout.txt
similarity index 100%
rename from test/027-arithmetic/expected.txt
rename to test/027-arithmetic/expected-stdout.txt

test/028-array-write/Android.bp

diff --git a/test/028-array-write/Android.bp b/test/028-array-write/Android.bp
index 9417f40..0f1558c 100644
--- a/test/028-array-write/Android.bp
+++ b/test/028-array-write/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-028-array-write-expected"],
+    data: [":art-run-test-028-array-write-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-028-array-write-expected",
-    out: ["art-run-test-028-array-write-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-028-array-write-expected-stdout",
+    out: ["art-run-test-028-array-write-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/028-array-write/expected-stdout.txt

diff --git a/test/028-array-write/expected.txt b/test/028-array-write/expected-stdout.txt
similarity index 100%
rename from test/028-array-write/expected.txt
rename to test/028-array-write/expected-stdout.txt

test/029-assert/Android.bp

diff --git a/test/029-assert/Android.bp b/test/029-assert/Android.bp
index 05090bf..aa222ed 100644
--- a/test/029-assert/Android.bp
+++ b/test/029-assert/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-029-assert-expected"],
+    data: [":art-run-test-029-assert-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-029-assert-expected",
-    out: ["art-run-test-029-assert-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-029-assert-expected-stdout",
+    out: ["art-run-test-029-assert-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/029-assert/expected-stdout.txt

diff --git a/test/029-assert/expected.txt b/test/029-assert/expected-stdout.txt
similarity index 100%
rename from test/029-assert/expected.txt
rename to test/029-assert/expected-stdout.txt

test/030-bad-finalizer/Android.bp

diff --git a/test/030-bad-finalizer/Android.bp b/test/030-bad-finalizer/Android.bp
index f032e51..b507ccb 100644
--- a/test/030-bad-finalizer/Android.bp
+++ b/test/030-bad-finalizer/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-030-bad-finalizer-expected"],
+    data: [":art-run-test-030-bad-finalizer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-030-bad-finalizer-expected",
-    out: ["art-run-test-030-bad-finalizer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-030-bad-finalizer-expected-stdout",
+    out: ["art-run-test-030-bad-finalizer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/030-bad-finalizer/expected-stdout.txt

diff --git a/test/030-bad-finalizer/expected.txt b/test/030-bad-finalizer/expected-stdout.txt
similarity index 100%
rename from test/030-bad-finalizer/expected.txt
rename to test/030-bad-finalizer/expected-stdout.txt

test/031-class-attributes/expected-stdout.txt

diff --git a/test/031-class-attributes/expected.txt b/test/031-class-attributes/expected-stdout.txt
similarity index 100%
rename from test/031-class-attributes/expected.txt
rename to test/031-class-attributes/expected-stdout.txt

test/032-concrete-sub/expected-stdout.txt

diff --git a/test/032-concrete-sub/expected.txt b/test/032-concrete-sub/expected-stdout.txt
similarity index 100%
rename from test/032-concrete-sub/expected.txt
rename to test/032-concrete-sub/expected-stdout.txt

test/033-class-init-deadlock/Android.bp

diff --git a/test/033-class-init-deadlock/Android.bp b/test/033-class-init-deadlock/Android.bp
index 0b6b410..f367406 100644
--- a/test/033-class-init-deadlock/Android.bp
+++ b/test/033-class-init-deadlock/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-033-class-init-deadlock-expected"],
+    data: [":art-run-test-033-class-init-deadlock-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-033-class-init-deadlock-expected",
-    out: ["art-run-test-033-class-init-deadlock-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-033-class-init-deadlock-expected-stdout",
+    out: ["art-run-test-033-class-init-deadlock-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/033-class-init-deadlock/expected-stdout.txt

diff --git a/test/033-class-init-deadlock/expected.txt b/test/033-class-init-deadlock/expected-stdout.txt
similarity index 100%
rename from test/033-class-init-deadlock/expected.txt
rename to test/033-class-init-deadlock/expected-stdout.txt

test/034-call-null/Android.bp

diff --git a/test/034-call-null/Android.bp b/test/034-call-null/Android.bp
index bf87771..de3a93e 100644
--- a/test/034-call-null/Android.bp
+++ b/test/034-call-null/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-034-call-null-expected"],
+    data: [":art-run-test-034-call-null-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-034-call-null-expected",
-    out: ["art-run-test-034-call-null-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-034-call-null-expected-stdout",
+    out: ["art-run-test-034-call-null-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/034-call-null/expected-stdout.txt

diff --git a/test/034-call-null/expected.txt b/test/034-call-null/expected-stdout.txt
similarity index 100%
rename from test/034-call-null/expected.txt
rename to test/034-call-null/expected-stdout.txt

test/035-enum/Android.bp

diff --git a/test/035-enum/Android.bp b/test/035-enum/Android.bp
index 9ed3999..011ea2d 100644
--- a/test/035-enum/Android.bp
+++ b/test/035-enum/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-035-enum-expected"],
+    data: [":art-run-test-035-enum-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-035-enum-expected",
-    out: ["art-run-test-035-enum-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-035-enum-expected-stdout",
+    out: ["art-run-test-035-enum-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/035-enum/expected-stdout.txt

diff --git a/test/035-enum/expected.txt b/test/035-enum/expected-stdout.txt
similarity index 100%
rename from test/035-enum/expected.txt
rename to test/035-enum/expected-stdout.txt

test/036-finalizer/Android.bp

diff --git a/test/036-finalizer/Android.bp b/test/036-finalizer/Android.bp
index 5586453..028bc0a 100644
--- a/test/036-finalizer/Android.bp
+++ b/test/036-finalizer/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-036-finalizer-expected"],
+    data: [":art-run-test-036-finalizer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-036-finalizer-expected",
-    out: ["art-run-test-036-finalizer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-036-finalizer-expected-stdout",
+    out: ["art-run-test-036-finalizer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/036-finalizer/expected-stdout.txt

diff --git a/test/036-finalizer/expected.txt b/test/036-finalizer/expected-stdout.txt
similarity index 100%
rename from test/036-finalizer/expected.txt
rename to test/036-finalizer/expected-stdout.txt

test/037-inherit/Android.bp

diff --git a/test/037-inherit/Android.bp b/test/037-inherit/Android.bp
index 9aebf44..270f7e8 100644
--- a/test/037-inherit/Android.bp
+++ b/test/037-inherit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-037-inherit-expected"],
+    data: [":art-run-test-037-inherit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-037-inherit-expected",
-    out: ["art-run-test-037-inherit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-037-inherit-expected-stdout",
+    out: ["art-run-test-037-inherit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/037-inherit/expected-stdout.txt

diff --git a/test/037-inherit/expected.txt b/test/037-inherit/expected-stdout.txt
similarity index 100%
rename from test/037-inherit/expected.txt
rename to test/037-inherit/expected-stdout.txt

test/038-inner-null/Android.bp

diff --git a/test/038-inner-null/Android.bp b/test/038-inner-null/Android.bp
index 293426c..bfae117 100644
--- a/test/038-inner-null/Android.bp
+++ b/test/038-inner-null/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-038-inner-null-expected"],
+    data: [":art-run-test-038-inner-null-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-038-inner-null-expected",
-    out: ["art-run-test-038-inner-null-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-038-inner-null-expected-stdout",
+    out: ["art-run-test-038-inner-null-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/038-inner-null/expected-stdout.txt

diff --git a/test/038-inner-null/expected.txt b/test/038-inner-null/expected-stdout.txt
similarity index 100%
rename from test/038-inner-null/expected.txt
rename to test/038-inner-null/expected-stdout.txt

test/039-join-main/Android.bp

diff --git a/test/039-join-main/Android.bp b/test/039-join-main/Android.bp
index 8af6335..c42b146 100644
--- a/test/039-join-main/Android.bp
+++ b/test/039-join-main/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-039-join-main-expected"],
+    data: [":art-run-test-039-join-main-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-039-join-main-expected",
-    out: ["art-run-test-039-join-main-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-039-join-main-expected-stdout",
+    out: ["art-run-test-039-join-main-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/039-join-main/expected-stdout.txt

diff --git a/test/039-join-main/expected.txt b/test/039-join-main/expected-stdout.txt
similarity index 100%
rename from test/039-join-main/expected.txt
rename to test/039-join-main/expected-stdout.txt

test/040-miranda/Android.bp

diff --git a/test/040-miranda/Android.bp b/test/040-miranda/Android.bp
index 6335682..92c4cba 100644
--- a/test/040-miranda/Android.bp
+++ b/test/040-miranda/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-040-miranda-expected"],
+    data: [":art-run-test-040-miranda-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-040-miranda-expected",
-    out: ["art-run-test-040-miranda-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-040-miranda-expected-stdout",
+    out: ["art-run-test-040-miranda-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/040-miranda/expected-stdout.txt

diff --git a/test/040-miranda/expected.txt b/test/040-miranda/expected-stdout.txt
similarity index 100%
rename from test/040-miranda/expected.txt
rename to test/040-miranda/expected-stdout.txt

test/041-narrowing/Android.bp

diff --git a/test/041-narrowing/Android.bp b/test/041-narrowing/Android.bp
index ee249a7..2a11c06 100644
--- a/test/041-narrowing/Android.bp
+++ b/test/041-narrowing/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-041-narrowing-expected"],
+    data: [":art-run-test-041-narrowing-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-041-narrowing-expected",
-    out: ["art-run-test-041-narrowing-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-041-narrowing-expected-stdout",
+    out: ["art-run-test-041-narrowing-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/041-narrowing/expected-stdout.txt

diff --git a/test/041-narrowing/expected.txt b/test/041-narrowing/expected-stdout.txt
similarity index 100%
rename from test/041-narrowing/expected.txt
rename to test/041-narrowing/expected-stdout.txt

test/042-new-instance/expected-stdout.txt

diff --git a/test/042-new-instance/expected.txt b/test/042-new-instance/expected-stdout.txt
similarity index 100%
rename from test/042-new-instance/expected.txt
rename to test/042-new-instance/expected-stdout.txt

test/043-privates/Android.bp

diff --git a/test/043-privates/Android.bp b/test/043-privates/Android.bp
index dd5802d..931e0b6 100644
--- a/test/043-privates/Android.bp
+++ b/test/043-privates/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-043-privates-expected"],
+    data: [":art-run-test-043-privates-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-043-privates-expected",
-    out: ["art-run-test-043-privates-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-043-privates-expected-stdout",
+    out: ["art-run-test-043-privates-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/043-privates/expected-stdout.txt

diff --git a/test/043-privates/expected.txt b/test/043-privates/expected-stdout.txt
similarity index 100%
rename from test/043-privates/expected.txt
rename to test/043-privates/expected-stdout.txt

test/044-proxy/Android.bp

diff --git a/test/044-proxy/Android.bp b/test/044-proxy/Android.bp
index b862e88..0d23221 100644
--- a/test/044-proxy/Android.bp
+++ b/test/044-proxy/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-044-proxy-expected"],
+    data: [":art-run-test-044-proxy-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-044-proxy-expected",
-    out: ["art-run-test-044-proxy-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-044-proxy-expected-stdout",
+    out: ["art-run-test-044-proxy-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/044-proxy/expected-stdout.txt

diff --git a/test/044-proxy/expected.txt b/test/044-proxy/expected-stdout.txt
similarity index 100%
rename from test/044-proxy/expected.txt
rename to test/044-proxy/expected-stdout.txt

test/045-reflect-array/Android.bp

diff --git a/test/045-reflect-array/Android.bp b/test/045-reflect-array/Android.bp
index 9475745..699c36e 100644
--- a/test/045-reflect-array/Android.bp
+++ b/test/045-reflect-array/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-045-reflect-array-expected"],
+    data: [":art-run-test-045-reflect-array-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-045-reflect-array-expected",
-    out: ["art-run-test-045-reflect-array-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-045-reflect-array-expected-stdout",
+    out: ["art-run-test-045-reflect-array-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/045-reflect-array/expected-stdout.txt

diff --git a/test/045-reflect-array/expected.txt b/test/045-reflect-array/expected-stdout.txt
similarity index 100%
rename from test/045-reflect-array/expected.txt
rename to test/045-reflect-array/expected-stdout.txt

test/046-reflect/Android.bp

diff --git a/test/046-reflect/Android.bp b/test/046-reflect/Android.bp
index 56a0591..7e2fbee 100644
--- a/test/046-reflect/Android.bp
+++ b/test/046-reflect/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-046-reflect-expected"],
+    data: [":art-run-test-046-reflect-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-046-reflect-expected",
-    out: ["art-run-test-046-reflect-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-046-reflect-expected-stdout",
+    out: ["art-run-test-046-reflect-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/046-reflect/expected-stdout.txt

diff --git a/test/046-reflect/expected.txt b/test/046-reflect/expected-stdout.txt
similarity index 100%
rename from test/046-reflect/expected.txt
rename to test/046-reflect/expected-stdout.txt

test/047-returns/Android.bp

diff --git a/test/047-returns/Android.bp b/test/047-returns/Android.bp
index d907077..6f3bca3 100644
--- a/test/047-returns/Android.bp
+++ b/test/047-returns/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-047-returns-expected"],
+    data: [":art-run-test-047-returns-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-047-returns-expected",
-    out: ["art-run-test-047-returns-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-047-returns-expected-stdout",
+    out: ["art-run-test-047-returns-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/047-returns/expected-stdout.txt

diff --git a/test/047-returns/expected.txt b/test/047-returns/expected-stdout.txt
similarity index 100%
rename from test/047-returns/expected.txt
rename to test/047-returns/expected-stdout.txt

test/048-reflect-v8/Android.bp

diff --git a/test/048-reflect-v8/Android.bp b/test/048-reflect-v8/Android.bp
index a5737a8..274a110 100644
--- a/test/048-reflect-v8/Android.bp
+++ b/test/048-reflect-v8/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-048-reflect-v8-expected"],
+    data: [":art-run-test-048-reflect-v8-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-048-reflect-v8-expected",
-    out: ["art-run-test-048-reflect-v8-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-048-reflect-v8-expected-stdout",
+    out: ["art-run-test-048-reflect-v8-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/048-reflect-v8/expected-stdout.txt

diff --git a/test/048-reflect-v8/expected.txt b/test/048-reflect-v8/expected-stdout.txt
similarity index 100%
rename from test/048-reflect-v8/expected.txt
rename to test/048-reflect-v8/expected-stdout.txt

test/049-show-object/Android.bp

diff --git a/test/049-show-object/Android.bp b/test/049-show-object/Android.bp
index 219a556..2d77a1d 100644
--- a/test/049-show-object/Android.bp
+++ b/test/049-show-object/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-049-show-object-expected"],
+    data: [":art-run-test-049-show-object-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-049-show-object-expected",
-    out: ["art-run-test-049-show-object-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-049-show-object-expected-stdout",
+    out: ["art-run-test-049-show-object-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/049-show-object/expected-stdout.txt

diff --git a/test/049-show-object/expected.txt b/test/049-show-object/expected-stdout.txt
similarity index 100%
rename from test/049-show-object/expected.txt
rename to test/049-show-object/expected-stdout.txt

test/050-sync-test/Android.bp

diff --git a/test/050-sync-test/Android.bp b/test/050-sync-test/Android.bp
index e683446..f1a562a 100644
--- a/test/050-sync-test/Android.bp
+++ b/test/050-sync-test/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-050-sync-test-expected"],
+    data: [":art-run-test-050-sync-test-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-050-sync-test-expected",
-    out: ["art-run-test-050-sync-test-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-050-sync-test-expected-stdout",
+    out: ["art-run-test-050-sync-test-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/050-sync-test/expected-stdout.txt

diff --git a/test/050-sync-test/expected.txt b/test/050-sync-test/expected-stdout.txt
similarity index 100%
rename from test/050-sync-test/expected.txt
rename to test/050-sync-test/expected-stdout.txt

test/051-thread/Android.bp

diff --git a/test/051-thread/Android.bp b/test/051-thread/Android.bp
index e974c27..2348af4 100644
--- a/test/051-thread/Android.bp
+++ b/test/051-thread/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-051-thread-expected"],
+    data: [":art-run-test-051-thread-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-051-thread-expected",
-    out: ["art-run-test-051-thread-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-051-thread-expected-stdout",
+    out: ["art-run-test-051-thread-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/051-thread/expected-stdout.txt

diff --git a/test/051-thread/expected.txt b/test/051-thread/expected-stdout.txt
similarity index 100%
rename from test/051-thread/expected.txt
rename to test/051-thread/expected-stdout.txt

test/052-verifier-fun/Android.bp

diff --git a/test/052-verifier-fun/Android.bp b/test/052-verifier-fun/Android.bp
index e8c2e1e..bb3ba4a 100644
--- a/test/052-verifier-fun/Android.bp
+++ b/test/052-verifier-fun/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-052-verifier-fun-expected"],
+    data: [":art-run-test-052-verifier-fun-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-052-verifier-fun-expected",
-    out: ["art-run-test-052-verifier-fun-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-052-verifier-fun-expected-stdout",
+    out: ["art-run-test-052-verifier-fun-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/052-verifier-fun/expected-stdout.txt

diff --git a/test/052-verifier-fun/expected.txt b/test/052-verifier-fun/expected-stdout.txt
similarity index 100%
rename from test/052-verifier-fun/expected.txt
rename to test/052-verifier-fun/expected-stdout.txt

test/053-wait-some/Android.bp

diff --git a/test/053-wait-some/Android.bp b/test/053-wait-some/Android.bp
index 8f3f3a5..8679171 100644
--- a/test/053-wait-some/Android.bp
+++ b/test/053-wait-some/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-053-wait-some-expected"],
+    data: [":art-run-test-053-wait-some-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-053-wait-some-expected",
-    out: ["art-run-test-053-wait-some-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-053-wait-some-expected-stdout",
+    out: ["art-run-test-053-wait-some-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/053-wait-some/expected-stdout.txt

diff --git a/test/053-wait-some/expected.txt b/test/053-wait-some/expected-stdout.txt
similarity index 100%
rename from test/053-wait-some/expected.txt
rename to test/053-wait-some/expected-stdout.txt

test/054-uncaught/Android.bp

diff --git a/test/054-uncaught/Android.bp b/test/054-uncaught/Android.bp
index 82bacdf..be0eda0 100644
--- a/test/054-uncaught/Android.bp
+++ b/test/054-uncaught/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-054-uncaught-expected"],
+    data: [":art-run-test-054-uncaught-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-054-uncaught-expected",
-    out: ["art-run-test-054-uncaught-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-054-uncaught-expected-stdout",
+    out: ["art-run-test-054-uncaught-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/054-uncaught/expected-stdout.txt

diff --git a/test/054-uncaught/expected.txt b/test/054-uncaught/expected-stdout.txt
similarity index 100%
rename from test/054-uncaught/expected.txt
rename to test/054-uncaught/expected-stdout.txt

test/055-enum-performance/Android.bp

diff --git a/test/055-enum-performance/Android.bp b/test/055-enum-performance/Android.bp
index b17a321..e53f4fd 100644
--- a/test/055-enum-performance/Android.bp
+++ b/test/055-enum-performance/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-055-enum-performance-expected"],
+    data: [":art-run-test-055-enum-performance-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-055-enum-performance-expected",
-    out: ["art-run-test-055-enum-performance-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-055-enum-performance-expected-stdout",
+    out: ["art-run-test-055-enum-performance-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/055-enum-performance/expected-stdout.txt

diff --git a/test/055-enum-performance/expected.txt b/test/055-enum-performance/expected-stdout.txt
similarity index 100%
rename from test/055-enum-performance/expected.txt
rename to test/055-enum-performance/expected-stdout.txt

test/056-const-string-jumbo/expected-stdout.txt

diff --git a/test/056-const-string-jumbo/expected.txt b/test/056-const-string-jumbo/expected-stdout.txt
similarity index 100%
rename from test/056-const-string-jumbo/expected.txt
rename to test/056-const-string-jumbo/expected-stdout.txt

test/058-enum-order/Android.bp

diff --git a/test/058-enum-order/Android.bp b/test/058-enum-order/Android.bp
index 1d1f14f..d076d7d 100644
--- a/test/058-enum-order/Android.bp
+++ b/test/058-enum-order/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-058-enum-order-expected"],
+    data: [":art-run-test-058-enum-order-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-058-enum-order-expected",
-    out: ["art-run-test-058-enum-order-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-058-enum-order-expected-stdout",
+    out: ["art-run-test-058-enum-order-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/058-enum-order/expected-stdout.txt

diff --git a/test/058-enum-order/expected.txt b/test/058-enum-order/expected-stdout.txt
similarity index 100%
rename from test/058-enum-order/expected.txt
rename to test/058-enum-order/expected-stdout.txt

test/059-finalizer-throw/Android.bp

diff --git a/test/059-finalizer-throw/Android.bp b/test/059-finalizer-throw/Android.bp
index bba058c..3ac4ba1 100644
--- a/test/059-finalizer-throw/Android.bp
+++ b/test/059-finalizer-throw/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-059-finalizer-throw-expected"],
+    data: [":art-run-test-059-finalizer-throw-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-059-finalizer-throw-expected",
-    out: ["art-run-test-059-finalizer-throw-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-059-finalizer-throw-expected-stdout",
+    out: ["art-run-test-059-finalizer-throw-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/059-finalizer-throw/expected-stdout.txt

diff --git a/test/059-finalizer-throw/expected.txt b/test/059-finalizer-throw/expected-stdout.txt
similarity index 100%
rename from test/059-finalizer-throw/expected.txt
rename to test/059-finalizer-throw/expected-stdout.txt

test/061-out-of-memory/Android.bp

diff --git a/test/061-out-of-memory/Android.bp b/test/061-out-of-memory/Android.bp
index 8597991..9fd42f4 100644
--- a/test/061-out-of-memory/Android.bp
+++ b/test/061-out-of-memory/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-061-out-of-memory-expected"],
+    data: [":art-run-test-061-out-of-memory-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-061-out-of-memory-expected",
-    out: ["art-run-test-061-out-of-memory-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-061-out-of-memory-expected-stdout",
+    out: ["art-run-test-061-out-of-memory-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/061-out-of-memory/expected-stdout.txt

diff --git a/test/061-out-of-memory/expected.txt b/test/061-out-of-memory/expected-stdout.txt
similarity index 100%
rename from test/061-out-of-memory/expected.txt
rename to test/061-out-of-memory/expected-stdout.txt

test/062-character-encodings/Android.bp

diff --git a/test/062-character-encodings/Android.bp b/test/062-character-encodings/Android.bp
index efc2df8..4533abb 100644
--- a/test/062-character-encodings/Android.bp
+++ b/test/062-character-encodings/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-062-character-encodings-expected"],
+    data: [":art-run-test-062-character-encodings-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-062-character-encodings-expected",
-    out: ["art-run-test-062-character-encodings-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-062-character-encodings-expected-stdout",
+    out: ["art-run-test-062-character-encodings-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/062-character-encodings/expected-stdout.txt

diff --git a/test/062-character-encodings/expected.txt b/test/062-character-encodings/expected-stdout.txt
similarity index 100%
rename from test/062-character-encodings/expected.txt
rename to test/062-character-encodings/expected-stdout.txt

test/063-process-manager/Android.bp

diff --git a/test/063-process-manager/Android.bp b/test/063-process-manager/Android.bp
index 339515b..f08e2af 100644
--- a/test/063-process-manager/Android.bp
+++ b/test/063-process-manager/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-063-process-manager-expected"],
+    data: [":art-run-test-063-process-manager-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-063-process-manager-expected",
-    out: ["art-run-test-063-process-manager-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-063-process-manager-expected-stdout",
+    out: ["art-run-test-063-process-manager-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/063-process-manager/expected-stdout.txt

diff --git a/test/063-process-manager/expected.txt b/test/063-process-manager/expected-stdout.txt
similarity index 100%
rename from test/063-process-manager/expected.txt
rename to test/063-process-manager/expected-stdout.txt

test/064-field-access/expected-stdout.txt

diff --git a/test/064-field-access/expected.txt b/test/064-field-access/expected-stdout.txt
similarity index 100%
rename from test/064-field-access/expected.txt
rename to test/064-field-access/expected-stdout.txt

test/065-mismatched-implements/expected-stdout.txt

diff --git a/test/065-mismatched-implements/expected.txt b/test/065-mismatched-implements/expected-stdout.txt
similarity index 100%
rename from test/065-mismatched-implements/expected.txt
rename to test/065-mismatched-implements/expected-stdout.txt

test/066-mismatched-super/expected-stdout.txt

diff --git a/test/066-mismatched-super/expected.txt b/test/066-mismatched-super/expected-stdout.txt
similarity index 100%
rename from test/066-mismatched-super/expected.txt
rename to test/066-mismatched-super/expected-stdout.txt

test/067-preemptive-unpark/Android.bp

diff --git a/test/067-preemptive-unpark/Android.bp b/test/067-preemptive-unpark/Android.bp
index 39247c6..cadd4af 100644
--- a/test/067-preemptive-unpark/Android.bp
+++ b/test/067-preemptive-unpark/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-067-preemptive-unpark-expected"],
+    data: [":art-run-test-067-preemptive-unpark-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-067-preemptive-unpark-expected",
-    out: ["art-run-test-067-preemptive-unpark-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-067-preemptive-unpark-expected-stdout",
+    out: ["art-run-test-067-preemptive-unpark-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/067-preemptive-unpark/expected-stdout.txt

diff --git a/test/067-preemptive-unpark/expected.txt b/test/067-preemptive-unpark/expected-stdout.txt
similarity index 100%
rename from test/067-preemptive-unpark/expected.txt
rename to test/067-preemptive-unpark/expected-stdout.txt

test/068-classloader/expected-stdout.txt

diff --git a/test/068-classloader/expected.txt b/test/068-classloader/expected-stdout.txt
similarity index 100%
rename from test/068-classloader/expected.txt
rename to test/068-classloader/expected-stdout.txt

test/069-field-type/expected-stdout.txt

diff --git a/test/069-field-type/expected.txt b/test/069-field-type/expected-stdout.txt
similarity index 100%
rename from test/069-field-type/expected.txt
rename to test/069-field-type/expected-stdout.txt

test/070-nio-buffer/Android.bp

diff --git a/test/070-nio-buffer/Android.bp b/test/070-nio-buffer/Android.bp
index ceaf3cb..c46a159 100644
--- a/test/070-nio-buffer/Android.bp
+++ b/test/070-nio-buffer/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-070-nio-buffer-expected"],
+    data: [":art-run-test-070-nio-buffer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-070-nio-buffer-expected",
-    out: ["art-run-test-070-nio-buffer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-070-nio-buffer-expected-stdout",
+    out: ["art-run-test-070-nio-buffer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/070-nio-buffer/expected-stdout.txt

diff --git a/test/070-nio-buffer/expected.txt b/test/070-nio-buffer/expected-stdout.txt
similarity index 100%
rename from test/070-nio-buffer/expected.txt
rename to test/070-nio-buffer/expected-stdout.txt

test/071-dexfile-get-static-size/expected-stdout.txt

diff --git a/test/071-dexfile-get-static-size/expected.txt b/test/071-dexfile-get-static-size/expected-stdout.txt
similarity index 100%
rename from test/071-dexfile-get-static-size/expected.txt
rename to test/071-dexfile-get-static-size/expected-stdout.txt

test/071-dexfile-map-clean/expected-stdout.txt

diff --git a/test/071-dexfile-map-clean/expected.txt b/test/071-dexfile-map-clean/expected-stdout.txt
similarity index 100%
rename from test/071-dexfile-map-clean/expected.txt
rename to test/071-dexfile-map-clean/expected-stdout.txt

test/071-dexfile/expected-stdout.txt

diff --git a/test/071-dexfile/expected.txt b/test/071-dexfile/expected-stdout.txt
similarity index 100%
rename from test/071-dexfile/expected.txt
rename to test/071-dexfile/expected-stdout.txt

test/072-precise-gc/Android.bp

diff --git a/test/072-precise-gc/Android.bp b/test/072-precise-gc/Android.bp
index 2bd33c9..7a521be 100644
--- a/test/072-precise-gc/Android.bp
+++ b/test/072-precise-gc/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-072-precise-gc-expected"],
+    data: [":art-run-test-072-precise-gc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-072-precise-gc-expected",
-    out: ["art-run-test-072-precise-gc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-072-precise-gc-expected-stdout",
+    out: ["art-run-test-072-precise-gc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/072-precise-gc/expected-stdout.txt

diff --git a/test/072-precise-gc/expected.txt b/test/072-precise-gc/expected-stdout.txt
similarity index 100%
rename from test/072-precise-gc/expected.txt
rename to test/072-precise-gc/expected-stdout.txt

test/072-reachability-fence/Android.bp

diff --git a/test/072-reachability-fence/Android.bp b/test/072-reachability-fence/Android.bp
index 311653b..bea2efa 100644
--- a/test/072-reachability-fence/Android.bp
+++ b/test/072-reachability-fence/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-072-reachability-fence-expected"],
+    data: [":art-run-test-072-reachability-fence-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-072-reachability-fence-expected",
-    out: ["art-run-test-072-reachability-fence-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-072-reachability-fence-expected-stdout",
+    out: ["art-run-test-072-reachability-fence-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/072-reachability-fence/expected-stdout.txt

diff --git a/test/072-reachability-fence/expected.txt b/test/072-reachability-fence/expected-stdout.txt
similarity index 100%
rename from test/072-reachability-fence/expected.txt
rename to test/072-reachability-fence/expected-stdout.txt

test/073-mismatched-field/expected-stdout.txt

diff --git a/test/073-mismatched-field/expected.txt b/test/073-mismatched-field/expected-stdout.txt
similarity index 100%
rename from test/073-mismatched-field/expected.txt
rename to test/073-mismatched-field/expected-stdout.txt

test/074-gc-thrash/Android.bp

diff --git a/test/074-gc-thrash/Android.bp b/test/074-gc-thrash/Android.bp
index c7e601a..3b3958a 100644
--- a/test/074-gc-thrash/Android.bp
+++ b/test/074-gc-thrash/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-074-gc-thrash-expected"],
+    data: [":art-run-test-074-gc-thrash-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-074-gc-thrash-expected",
-    out: ["art-run-test-074-gc-thrash-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-074-gc-thrash-expected-stdout",
+    out: ["art-run-test-074-gc-thrash-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/074-gc-thrash/expected-stdout.txt

diff --git a/test/074-gc-thrash/expected.txt b/test/074-gc-thrash/expected-stdout.txt
similarity index 100%
rename from test/074-gc-thrash/expected.txt
rename to test/074-gc-thrash/expected-stdout.txt

test/075-verification-error/expected-stdout.txt

diff --git a/test/075-verification-error/expected.txt b/test/075-verification-error/expected-stdout.txt
similarity index 100%
rename from test/075-verification-error/expected.txt
rename to test/075-verification-error/expected-stdout.txt

test/076-boolean-put/Android.bp

diff --git a/test/076-boolean-put/Android.bp b/test/076-boolean-put/Android.bp
index b74b5f2..1eee203 100644
--- a/test/076-boolean-put/Android.bp
+++ b/test/076-boolean-put/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-076-boolean-put-expected"],
+    data: [":art-run-test-076-boolean-put-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-076-boolean-put-expected",
-    out: ["art-run-test-076-boolean-put-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-076-boolean-put-expected-stdout",
+    out: ["art-run-test-076-boolean-put-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/076-boolean-put/expected-stdout.txt

diff --git a/test/076-boolean-put/expected.txt b/test/076-boolean-put/expected-stdout.txt
similarity index 100%
rename from test/076-boolean-put/expected.txt
rename to test/076-boolean-put/expected-stdout.txt

test/077-method-override/expected-stdout.txt

diff --git a/test/077-method-override/expected.txt b/test/077-method-override/expected-stdout.txt
similarity index 100%
rename from test/077-method-override/expected.txt
rename to test/077-method-override/expected-stdout.txt

test/078-polymorphic-virtual/Android.bp

diff --git a/test/078-polymorphic-virtual/Android.bp b/test/078-polymorphic-virtual/Android.bp
index 408b5c8..43b0b34 100644
--- a/test/078-polymorphic-virtual/Android.bp
+++ b/test/078-polymorphic-virtual/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-078-polymorphic-virtual-expected"],
+    data: [":art-run-test-078-polymorphic-virtual-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-078-polymorphic-virtual-expected",
-    out: ["art-run-test-078-polymorphic-virtual-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-078-polymorphic-virtual-expected-stdout",
+    out: ["art-run-test-078-polymorphic-virtual-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/078-polymorphic-virtual/expected-stdout.txt

diff --git a/test/078-polymorphic-virtual/expected.txt b/test/078-polymorphic-virtual/expected-stdout.txt
similarity index 100%
rename from test/078-polymorphic-virtual/expected.txt
rename to test/078-polymorphic-virtual/expected-stdout.txt

test/079-phantom/Android.bp

diff --git a/test/079-phantom/Android.bp b/test/079-phantom/Android.bp
index 90a8b18..2c59410 100644
--- a/test/079-phantom/Android.bp
+++ b/test/079-phantom/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-079-phantom-expected"],
+    data: [":art-run-test-079-phantom-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-079-phantom-expected",
-    out: ["art-run-test-079-phantom-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-079-phantom-expected-stdout",
+    out: ["art-run-test-079-phantom-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/079-phantom/expected-stdout.txt

diff --git a/test/079-phantom/expected.txt b/test/079-phantom/expected-stdout.txt
similarity index 100%
rename from test/079-phantom/expected.txt
rename to test/079-phantom/expected-stdout.txt

test/080-oom-fragmentation/Android.bp

diff --git a/test/080-oom-fragmentation/Android.bp b/test/080-oom-fragmentation/Android.bp
index 817bd98..c0023a0 100644
--- a/test/080-oom-fragmentation/Android.bp
+++ b/test/080-oom-fragmentation/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-080-oom-fragmentation-expected"],
+    data: [":art-run-test-080-oom-fragmentation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-080-oom-fragmentation-expected",
-    out: ["art-run-test-080-oom-fragmentation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-080-oom-fragmentation-expected-stdout",
+    out: ["art-run-test-080-oom-fragmentation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/080-oom-fragmentation/expected-stdout.txt

diff --git a/test/080-oom-fragmentation/expected.txt b/test/080-oom-fragmentation/expected-stdout.txt
similarity index 100%
rename from test/080-oom-fragmentation/expected.txt
rename to test/080-oom-fragmentation/expected-stdout.txt

test/080-oom-throw-with-finalizer/Android.bp

diff --git a/test/080-oom-throw-with-finalizer/Android.bp b/test/080-oom-throw-with-finalizer/Android.bp
index 3a2474c..c043107 100644
--- a/test/080-oom-throw-with-finalizer/Android.bp
+++ b/test/080-oom-throw-with-finalizer/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-080-oom-throw-with-finalizer-expected"],
+    data: [":art-run-test-080-oom-throw-with-finalizer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-080-oom-throw-with-finalizer-expected",
-    out: ["art-run-test-080-oom-throw-with-finalizer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-080-oom-throw-with-finalizer-expected-stdout",
+    out: ["art-run-test-080-oom-throw-with-finalizer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/080-oom-throw-with-finalizer/expected-stdout.txt

diff --git a/test/080-oom-throw-with-finalizer/expected.txt b/test/080-oom-throw-with-finalizer/expected-stdout.txt
similarity index 100%
rename from test/080-oom-throw-with-finalizer/expected.txt
rename to test/080-oom-throw-with-finalizer/expected-stdout.txt

test/080-oom-throw/Android.bp

diff --git a/test/080-oom-throw/Android.bp b/test/080-oom-throw/Android.bp
index ca5233d..6069fc4 100644
--- a/test/080-oom-throw/Android.bp
+++ b/test/080-oom-throw/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-080-oom-throw-expected"],
+    data: [":art-run-test-080-oom-throw-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-080-oom-throw-expected",
-    out: ["art-run-test-080-oom-throw-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-080-oom-throw-expected-stdout",
+    out: ["art-run-test-080-oom-throw-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/080-oom-throw/expected-stdout.txt

diff --git a/test/080-oom-throw/expected.txt b/test/080-oom-throw/expected-stdout.txt
similarity index 100%
rename from test/080-oom-throw/expected.txt
rename to test/080-oom-throw/expected-stdout.txt

test/081-hot-exceptions/Android.bp

diff --git a/test/081-hot-exceptions/Android.bp b/test/081-hot-exceptions/Android.bp
index 34c686d..e7e4cc6 100644
--- a/test/081-hot-exceptions/Android.bp
+++ b/test/081-hot-exceptions/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-081-hot-exceptions-expected"],
+    data: [":art-run-test-081-hot-exceptions-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-081-hot-exceptions-expected",
-    out: ["art-run-test-081-hot-exceptions-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-081-hot-exceptions-expected-stdout",
+    out: ["art-run-test-081-hot-exceptions-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/081-hot-exceptions/expected-stdout.txt

diff --git a/test/081-hot-exceptions/expected.txt b/test/081-hot-exceptions/expected-stdout.txt
similarity index 100%
rename from test/081-hot-exceptions/expected.txt
rename to test/081-hot-exceptions/expected-stdout.txt

test/082-inline-execute/Android.bp

diff --git a/test/082-inline-execute/Android.bp b/test/082-inline-execute/Android.bp
index 3bead60..f3bd0d5 100644
--- a/test/082-inline-execute/Android.bp
+++ b/test/082-inline-execute/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-082-inline-execute-expected"],
+    data: [":art-run-test-082-inline-execute-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-082-inline-execute-expected",
-    out: ["art-run-test-082-inline-execute-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-082-inline-execute-expected-stdout",
+    out: ["art-run-test-082-inline-execute-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/082-inline-execute/expected-stdout.txt

diff --git a/test/082-inline-execute/expected.txt b/test/082-inline-execute/expected-stdout.txt
similarity index 100%
rename from test/082-inline-execute/expected.txt
rename to test/082-inline-execute/expected-stdout.txt

test/083-compiler-regressions/Android.bp

diff --git a/test/083-compiler-regressions/Android.bp b/test/083-compiler-regressions/Android.bp
index 304693c..1bdd69b 100644
--- a/test/083-compiler-regressions/Android.bp
+++ b/test/083-compiler-regressions/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-083-compiler-regressions-expected"],
+    data: [":art-run-test-083-compiler-regressions-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-083-compiler-regressions-expected",
-    out: ["art-run-test-083-compiler-regressions-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-083-compiler-regressions-expected-stdout",
+    out: ["art-run-test-083-compiler-regressions-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/083-compiler-regressions/expected-stdout.txt

diff --git a/test/083-compiler-regressions/expected.txt b/test/083-compiler-regressions/expected-stdout.txt
similarity index 100%
rename from test/083-compiler-regressions/expected.txt
rename to test/083-compiler-regressions/expected-stdout.txt

test/084-class-init/Android.bp

diff --git a/test/084-class-init/Android.bp b/test/084-class-init/Android.bp
index 867d775..c922380 100644
--- a/test/084-class-init/Android.bp
+++ b/test/084-class-init/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-084-class-init-expected"],
+    data: [":art-run-test-084-class-init-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-084-class-init-expected",
-    out: ["art-run-test-084-class-init-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-084-class-init-expected-stdout",
+    out: ["art-run-test-084-class-init-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/084-class-init/expected-stdout.txt

diff --git a/test/084-class-init/expected.txt b/test/084-class-init/expected-stdout.txt
similarity index 100%
rename from test/084-class-init/expected.txt
rename to test/084-class-init/expected-stdout.txt

test/085-old-style-inner-class/expected-stdout.txt

diff --git a/test/085-old-style-inner-class/expected.txt b/test/085-old-style-inner-class/expected-stdout.txt
similarity index 100%
rename from test/085-old-style-inner-class/expected.txt
rename to test/085-old-style-inner-class/expected-stdout.txt

test/086-null-super/Android.bp

diff --git a/test/086-null-super/Android.bp b/test/086-null-super/Android.bp
index 7ea03b4..dd5615c 100644
--- a/test/086-null-super/Android.bp
+++ b/test/086-null-super/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-086-null-super-expected"],
+    data: [":art-run-test-086-null-super-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-086-null-super-expected",
-    out: ["art-run-test-086-null-super-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-086-null-super-expected-stdout",
+    out: ["art-run-test-086-null-super-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/086-null-super/expected-stdout.txt

diff --git a/test/086-null-super/expected.txt b/test/086-null-super/expected-stdout.txt
similarity index 100%
rename from test/086-null-super/expected.txt
rename to test/086-null-super/expected-stdout.txt

test/087-gc-after-link/Android.bp

diff --git a/test/087-gc-after-link/Android.bp b/test/087-gc-after-link/Android.bp
index 300e796..8210a8f 100644
--- a/test/087-gc-after-link/Android.bp
+++ b/test/087-gc-after-link/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-087-gc-after-link-expected"],
+    data: [":art-run-test-087-gc-after-link-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-087-gc-after-link-expected",
-    out: ["art-run-test-087-gc-after-link-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-087-gc-after-link-expected-stdout",
+    out: ["art-run-test-087-gc-after-link-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/087-gc-after-link/expected-stdout.txt

diff --git a/test/087-gc-after-link/expected.txt b/test/087-gc-after-link/expected-stdout.txt
similarity index 100%
rename from test/087-gc-after-link/expected.txt
rename to test/087-gc-after-link/expected-stdout.txt

test/088-monitor-verification/expected-stdout.txt

diff --git a/test/088-monitor-verification/expected.txt b/test/088-monitor-verification/expected-stdout.txt
similarity index 100%
rename from test/088-monitor-verification/expected.txt
rename to test/088-monitor-verification/expected-stdout.txt

test/089-many-methods/expected-stdout.txt

diff --git a/test/089-many-methods/expected.txt b/test/089-many-methods/expected-stdout.txt
similarity index 100%
rename from test/089-many-methods/expected.txt
rename to test/089-many-methods/expected-stdout.txt

test/090-loop-formation/Android.bp

diff --git a/test/090-loop-formation/Android.bp b/test/090-loop-formation/Android.bp
index e97fcd8..aa9e122 100644
--- a/test/090-loop-formation/Android.bp
+++ b/test/090-loop-formation/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-090-loop-formation-expected"],
+    data: [":art-run-test-090-loop-formation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-090-loop-formation-expected",
-    out: ["art-run-test-090-loop-formation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-090-loop-formation-expected-stdout",
+    out: ["art-run-test-090-loop-formation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/090-loop-formation/expected-stdout.txt

diff --git a/test/090-loop-formation/expected.txt b/test/090-loop-formation/expected-stdout.txt
similarity index 100%
rename from test/090-loop-formation/expected.txt
rename to test/090-loop-formation/expected-stdout.txt

test/091-override-package-private-method/expected-stdout.txt

diff --git a/test/091-override-package-private-method/expected.txt b/test/091-override-package-private-method/expected-stdout.txt
similarity index 100%
rename from test/091-override-package-private-method/expected.txt
rename to test/091-override-package-private-method/expected-stdout.txt

test/092-locale/Android.bp

diff --git a/test/092-locale/Android.bp b/test/092-locale/Android.bp
index 7a72406..0186cc5 100644
--- a/test/092-locale/Android.bp
+++ b/test/092-locale/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-092-locale-expected"],
+    data: [":art-run-test-092-locale-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-092-locale-expected",
-    out: ["art-run-test-092-locale-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-092-locale-expected-stdout",
+    out: ["art-run-test-092-locale-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/092-locale/expected-stdout.txt

diff --git a/test/092-locale/expected.txt b/test/092-locale/expected-stdout.txt
similarity index 100%
rename from test/092-locale/expected.txt
rename to test/092-locale/expected-stdout.txt

test/093-serialization/Android.bp

diff --git a/test/093-serialization/Android.bp b/test/093-serialization/Android.bp
index de0cf09..096884c 100644
--- a/test/093-serialization/Android.bp
+++ b/test/093-serialization/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-093-serialization-expected"],
+    data: [":art-run-test-093-serialization-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-093-serialization-expected",
-    out: ["art-run-test-093-serialization-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-093-serialization-expected-stdout",
+    out: ["art-run-test-093-serialization-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/093-serialization/expected-stdout.txt

diff --git a/test/093-serialization/expected.txt b/test/093-serialization/expected-stdout.txt
similarity index 100%
rename from test/093-serialization/expected.txt
rename to test/093-serialization/expected-stdout.txt

test/094-pattern/Android.bp

diff --git a/test/094-pattern/Android.bp b/test/094-pattern/Android.bp
index 7a8feea..57bcba7 100644
--- a/test/094-pattern/Android.bp
+++ b/test/094-pattern/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-094-pattern-expected"],
+    data: [":art-run-test-094-pattern-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-094-pattern-expected",
-    out: ["art-run-test-094-pattern-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-094-pattern-expected-stdout",
+    out: ["art-run-test-094-pattern-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/094-pattern/expected-stdout.txt

diff --git a/test/094-pattern/expected.txt b/test/094-pattern/expected-stdout.txt
similarity index 100%
rename from test/094-pattern/expected.txt
rename to test/094-pattern/expected-stdout.txt

test/095-switch-MAX_INT/Android.bp

diff --git a/test/095-switch-MAX_INT/Android.bp b/test/095-switch-MAX_INT/Android.bp
index ead51fb..547236b 100644
--- a/test/095-switch-MAX_INT/Android.bp
+++ b/test/095-switch-MAX_INT/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-095-switch-MAX_INT-expected"],
+    data: [":art-run-test-095-switch-MAX_INT-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-095-switch-MAX_INT-expected",
-    out: ["art-run-test-095-switch-MAX_INT-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-095-switch-MAX_INT-expected-stdout",
+    out: ["art-run-test-095-switch-MAX_INT-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/095-switch-MAX_INT/expected-stdout.txt

diff --git a/test/095-switch-MAX_INT/expected.txt b/test/095-switch-MAX_INT/expected-stdout.txt
similarity index 100%
rename from test/095-switch-MAX_INT/expected.txt
rename to test/095-switch-MAX_INT/expected-stdout.txt

test/096-array-copy-concurrent-gc/Android.bp

diff --git a/test/096-array-copy-concurrent-gc/Android.bp b/test/096-array-copy-concurrent-gc/Android.bp
index 5024ce9..467478a 100644
--- a/test/096-array-copy-concurrent-gc/Android.bp
+++ b/test/096-array-copy-concurrent-gc/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-096-array-copy-concurrent-gc-expected"],
+    data: [":art-run-test-096-array-copy-concurrent-gc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-096-array-copy-concurrent-gc-expected",
-    out: ["art-run-test-096-array-copy-concurrent-gc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-096-array-copy-concurrent-gc-expected-stdout",
+    out: ["art-run-test-096-array-copy-concurrent-gc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/096-array-copy-concurrent-gc/expected-stdout.txt

diff --git a/test/096-array-copy-concurrent-gc/expected.txt b/test/096-array-copy-concurrent-gc/expected-stdout.txt
similarity index 100%
rename from test/096-array-copy-concurrent-gc/expected.txt
rename to test/096-array-copy-concurrent-gc/expected-stdout.txt

test/097-duplicate-method/expected-stdout.txt

diff --git a/test/097-duplicate-method/expected.txt b/test/097-duplicate-method/expected-stdout.txt
similarity index 100%
rename from test/097-duplicate-method/expected.txt
rename to test/097-duplicate-method/expected-stdout.txt

test/098-ddmc/Android.bp

diff --git a/test/098-ddmc/Android.bp b/test/098-ddmc/Android.bp
index 6ed9298..fd2c695 100644
--- a/test/098-ddmc/Android.bp
+++ b/test/098-ddmc/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-098-ddmc-expected"],
+    data: [":art-run-test-098-ddmc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-098-ddmc-expected",
-    out: ["art-run-test-098-ddmc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-098-ddmc-expected-stdout",
+    out: ["art-run-test-098-ddmc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/098-ddmc/expected-stdout.txt

diff --git a/test/098-ddmc/expected.txt b/test/098-ddmc/expected-stdout.txt
similarity index 100%
rename from test/098-ddmc/expected.txt
rename to test/098-ddmc/expected-stdout.txt

test/099-vmdebug/Android.bp

diff --git a/test/099-vmdebug/Android.bp b/test/099-vmdebug/Android.bp
index 7ecd5a6..b245466 100644
--- a/test/099-vmdebug/Android.bp
+++ b/test/099-vmdebug/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-099-vmdebug-expected"],
+    data: [":art-run-test-099-vmdebug-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-099-vmdebug-expected",
-    out: ["art-run-test-099-vmdebug-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-099-vmdebug-expected-stdout",
+    out: ["art-run-test-099-vmdebug-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/099-vmdebug/expected-stdout.txt

diff --git a/test/099-vmdebug/expected.txt b/test/099-vmdebug/expected-stdout.txt
similarity index 100%
rename from test/099-vmdebug/expected.txt
rename to test/099-vmdebug/expected-stdout.txt

test/100-reflect2/Android.bp

diff --git a/test/100-reflect2/Android.bp b/test/100-reflect2/Android.bp
index cecc377..ffd1f9e 100644
--- a/test/100-reflect2/Android.bp
+++ b/test/100-reflect2/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-100-reflect2-expected"],
+    data: [":art-run-test-100-reflect2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-100-reflect2-expected",
-    out: ["art-run-test-100-reflect2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-100-reflect2-expected-stdout",
+    out: ["art-run-test-100-reflect2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/100-reflect2/expected-stdout.txt

diff --git a/test/100-reflect2/expected.txt b/test/100-reflect2/expected-stdout.txt
similarity index 100%
rename from test/100-reflect2/expected.txt
rename to test/100-reflect2/expected-stdout.txt

test/1000-non-moving-space-stress/expected-stdout.txt

diff --git a/test/1000-non-moving-space-stress/expected.txt b/test/1000-non-moving-space-stress/expected-stdout.txt
similarity index 100%
rename from test/1000-non-moving-space-stress/expected.txt
rename to test/1000-non-moving-space-stress/expected-stdout.txt

test/1001-app-image-regions/expected-stdout.txt

diff --git a/test/1001-app-image-regions/expected.txt b/test/1001-app-image-regions/expected-stdout.txt
similarity index 100%
rename from test/1001-app-image-regions/expected.txt
rename to test/1001-app-image-regions/expected-stdout.txt

test/1002-notify-startup/expected-stdout.txt

diff --git a/test/1002-notify-startup/expected.txt b/test/1002-notify-startup/expected-stdout.txt
similarity index 100%
rename from test/1002-notify-startup/expected.txt
rename to test/1002-notify-startup/expected-stdout.txt

test/1003-metadata-section-strings/expected-stdout.txt

diff --git a/test/1003-metadata-section-strings/expected.txt b/test/1003-metadata-section-strings/expected-stdout.txt
similarity index 100%
rename from test/1003-metadata-section-strings/expected.txt
rename to test/1003-metadata-section-strings/expected-stdout.txt

test/1004-checker-volatile-ref-load/Android.bp

diff --git a/test/1004-checker-volatile-ref-load/Android.bp b/test/1004-checker-volatile-ref-load/Android.bp
index f24a64b..98bce5d 100644
--- a/test/1004-checker-volatile-ref-load/Android.bp
+++ b/test/1004-checker-volatile-ref-load/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1004-checker-volatile-ref-load-expected"],
+    data: [":art-run-test-1004-checker-volatile-ref-load-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1004-checker-volatile-ref-load-expected",
-    out: ["art-run-test-1004-checker-volatile-ref-load-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1004-checker-volatile-ref-load-expected-stdout",
+    out: ["art-run-test-1004-checker-volatile-ref-load-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1004-checker-volatile-ref-load/expected-stdout.txt

diff --git a/test/1004-checker-volatile-ref-load/expected.txt b/test/1004-checker-volatile-ref-load/expected-stdout.txt
similarity index 100%
rename from test/1004-checker-volatile-ref-load/expected.txt
rename to test/1004-checker-volatile-ref-load/expected-stdout.txt

test/101-fibonacci/Android.bp

diff --git a/test/101-fibonacci/Android.bp b/test/101-fibonacci/Android.bp
index e1185c1..afa3dda 100644
--- a/test/101-fibonacci/Android.bp
+++ b/test/101-fibonacci/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-101-fibonacci-expected"],
+    data: [":art-run-test-101-fibonacci-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-101-fibonacci-expected",
-    out: ["art-run-test-101-fibonacci-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-101-fibonacci-expected-stdout",
+    out: ["art-run-test-101-fibonacci-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/101-fibonacci/expected-stdout.txt

diff --git a/test/101-fibonacci/expected.txt b/test/101-fibonacci/expected-stdout.txt
similarity index 100%
rename from test/101-fibonacci/expected.txt
rename to test/101-fibonacci/expected-stdout.txt

test/102-concurrent-gc/Android.bp

diff --git a/test/102-concurrent-gc/Android.bp b/test/102-concurrent-gc/Android.bp
index 883465a..42a1e9b 100644
--- a/test/102-concurrent-gc/Android.bp
+++ b/test/102-concurrent-gc/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-102-concurrent-gc-expected"],
+    data: [":art-run-test-102-concurrent-gc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-102-concurrent-gc-expected",
-    out: ["art-run-test-102-concurrent-gc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-102-concurrent-gc-expected-stdout",
+    out: ["art-run-test-102-concurrent-gc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/102-concurrent-gc/expected-stdout.txt

diff --git a/test/102-concurrent-gc/expected.txt b/test/102-concurrent-gc/expected-stdout.txt
similarity index 100%
rename from test/102-concurrent-gc/expected.txt
rename to test/102-concurrent-gc/expected-stdout.txt

test/103-string-append/Android.bp

diff --git a/test/103-string-append/Android.bp b/test/103-string-append/Android.bp
index a1155e4..6f61f26 100644
--- a/test/103-string-append/Android.bp
+++ b/test/103-string-append/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-103-string-append-expected"],
+    data: [":art-run-test-103-string-append-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-103-string-append-expected",
-    out: ["art-run-test-103-string-append-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-103-string-append-expected-stdout",
+    out: ["art-run-test-103-string-append-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/103-string-append/expected-stdout.txt

diff --git a/test/103-string-append/expected.txt b/test/103-string-append/expected-stdout.txt
similarity index 100%
rename from test/103-string-append/expected.txt
rename to test/103-string-append/expected-stdout.txt

test/104-growth-limit/Android.bp

diff --git a/test/104-growth-limit/Android.bp b/test/104-growth-limit/Android.bp
index 04f31f1..b9f39b3 100644
--- a/test/104-growth-limit/Android.bp
+++ b/test/104-growth-limit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-104-growth-limit-expected"],
+    data: [":art-run-test-104-growth-limit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-104-growth-limit-expected",
-    out: ["art-run-test-104-growth-limit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-104-growth-limit-expected-stdout",
+    out: ["art-run-test-104-growth-limit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/104-growth-limit/expected-stdout.txt

diff --git a/test/104-growth-limit/expected.txt b/test/104-growth-limit/expected-stdout.txt
similarity index 100%
rename from test/104-growth-limit/expected.txt
rename to test/104-growth-limit/expected-stdout.txt

test/105-invoke/Android.bp

diff --git a/test/105-invoke/Android.bp b/test/105-invoke/Android.bp
index 1977609..2dc324f 100644
--- a/test/105-invoke/Android.bp
+++ b/test/105-invoke/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-105-invoke-expected"],
+    data: [":art-run-test-105-invoke-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-105-invoke-expected",
-    out: ["art-run-test-105-invoke-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-105-invoke-expected-stdout",
+    out: ["art-run-test-105-invoke-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/105-invoke/expected-stdout.txt

diff --git a/test/105-invoke/expected.txt b/test/105-invoke/expected-stdout.txt
similarity index 100%
rename from test/105-invoke/expected.txt
rename to test/105-invoke/expected-stdout.txt

test/106-exceptions2/Android.bp

diff --git a/test/106-exceptions2/Android.bp b/test/106-exceptions2/Android.bp
index 3b3722a..e1c8393 100644
--- a/test/106-exceptions2/Android.bp
+++ b/test/106-exceptions2/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-106-exceptions2-expected"],
+    data: [":art-run-test-106-exceptions2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-106-exceptions2-expected",
-    out: ["art-run-test-106-exceptions2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-106-exceptions2-expected-stdout",
+    out: ["art-run-test-106-exceptions2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/106-exceptions2/expected-stdout.txt

diff --git a/test/106-exceptions2/expected.txt b/test/106-exceptions2/expected-stdout.txt
similarity index 100%
rename from test/106-exceptions2/expected.txt
rename to test/106-exceptions2/expected-stdout.txt

test/107-int-math2/Android.bp

diff --git a/test/107-int-math2/Android.bp b/test/107-int-math2/Android.bp
index 6ec7727..ef5015a 100644
--- a/test/107-int-math2/Android.bp
+++ b/test/107-int-math2/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-107-int-math2-expected"],
+    data: [":art-run-test-107-int-math2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-107-int-math2-expected",
-    out: ["art-run-test-107-int-math2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-107-int-math2-expected-stdout",
+    out: ["art-run-test-107-int-math2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/107-int-math2/expected-stdout.txt

diff --git a/test/107-int-math2/expected.txt b/test/107-int-math2/expected-stdout.txt
similarity index 100%
rename from test/107-int-math2/expected.txt
rename to test/107-int-math2/expected-stdout.txt

test/108-check-cast/Android.bp

diff --git a/test/108-check-cast/Android.bp b/test/108-check-cast/Android.bp
index 1b4d3b9..91a172c 100644
--- a/test/108-check-cast/Android.bp
+++ b/test/108-check-cast/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-108-check-cast-expected"],
+    data: [":art-run-test-108-check-cast-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-108-check-cast-expected",
-    out: ["art-run-test-108-check-cast-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-108-check-cast-expected-stdout",
+    out: ["art-run-test-108-check-cast-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/108-check-cast/expected-stdout.txt

diff --git a/test/108-check-cast/expected.txt b/test/108-check-cast/expected-stdout.txt
similarity index 100%
rename from test/108-check-cast/expected.txt
rename to test/108-check-cast/expected-stdout.txt

test/109-suspend-check/Android.bp

diff --git a/test/109-suspend-check/Android.bp b/test/109-suspend-check/Android.bp
index 5e74db7..6ddbe78 100644
--- a/test/109-suspend-check/Android.bp
+++ b/test/109-suspend-check/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-109-suspend-check-expected"],
+    data: [":art-run-test-109-suspend-check-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-109-suspend-check-expected",
-    out: ["art-run-test-109-suspend-check-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-109-suspend-check-expected-stdout",
+    out: ["art-run-test-109-suspend-check-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/109-suspend-check/expected-stdout.txt

diff --git a/test/109-suspend-check/expected.txt b/test/109-suspend-check/expected-stdout.txt
similarity index 100%
rename from test/109-suspend-check/expected.txt
rename to test/109-suspend-check/expected-stdout.txt

test/110-field-access/Android.bp

diff --git a/test/110-field-access/Android.bp b/test/110-field-access/Android.bp
index 5b857a5..9b6d242 100644
--- a/test/110-field-access/Android.bp
+++ b/test/110-field-access/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-110-field-access-expected"],
+    data: [":art-run-test-110-field-access-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-110-field-access-expected",
-    out: ["art-run-test-110-field-access-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-110-field-access-expected-stdout",
+    out: ["art-run-test-110-field-access-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/110-field-access/expected-stdout.txt

diff --git a/test/110-field-access/expected.txt b/test/110-field-access/expected-stdout.txt
similarity index 100%
rename from test/110-field-access/expected.txt
rename to test/110-field-access/expected-stdout.txt

test/111-unresolvable-exception/expected-stdout.txt

diff --git a/test/111-unresolvable-exception/expected.txt b/test/111-unresolvable-exception/expected-stdout.txt
similarity index 100%
rename from test/111-unresolvable-exception/expected.txt
rename to test/111-unresolvable-exception/expected-stdout.txt

test/112-double-math/Android.bp

diff --git a/test/112-double-math/Android.bp b/test/112-double-math/Android.bp
index e0f6b26..47284c4 100644
--- a/test/112-double-math/Android.bp
+++ b/test/112-double-math/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-112-double-math-expected"],
+    data: [":art-run-test-112-double-math-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-112-double-math-expected",
-    out: ["art-run-test-112-double-math-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-112-double-math-expected-stdout",
+    out: ["art-run-test-112-double-math-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/112-double-math/expected-stdout.txt

diff --git a/test/112-double-math/expected.txt b/test/112-double-math/expected-stdout.txt
similarity index 100%
rename from test/112-double-math/expected.txt
rename to test/112-double-math/expected-stdout.txt

test/113-multidex/expected-stdout.txt

diff --git a/test/113-multidex/expected.txt b/test/113-multidex/expected-stdout.txt
similarity index 100%
rename from test/113-multidex/expected.txt
rename to test/113-multidex/expected-stdout.txt

test/114-ParallelGC/Android.bp

diff --git a/test/114-ParallelGC/Android.bp b/test/114-ParallelGC/Android.bp
index 21ced76..f3e6f19 100644
--- a/test/114-ParallelGC/Android.bp
+++ b/test/114-ParallelGC/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-114-ParallelGC-expected"],
+    data: [":art-run-test-114-ParallelGC-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-114-ParallelGC-expected",
-    out: ["art-run-test-114-ParallelGC-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-114-ParallelGC-expected-stdout",
+    out: ["art-run-test-114-ParallelGC-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/114-ParallelGC/expected-stdout.txt

diff --git a/test/114-ParallelGC/expected.txt b/test/114-ParallelGC/expected-stdout.txt
similarity index 100%
rename from test/114-ParallelGC/expected.txt
rename to test/114-ParallelGC/expected-stdout.txt

test/115-native-bridge/Android.bp

diff --git a/test/115-native-bridge/Android.bp b/test/115-native-bridge/Android.bp
index fdc9cf3..cba48f7 100644
--- a/test/115-native-bridge/Android.bp
+++ b/test/115-native-bridge/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-115-native-bridge-expected"],
+    data: [":art-run-test-115-native-bridge-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-115-native-bridge-expected",
-    out: ["art-run-test-115-native-bridge-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-115-native-bridge-expected-stdout",
+    out: ["art-run-test-115-native-bridge-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/115-native-bridge/expected-stdout.txt

diff --git a/test/115-native-bridge/expected.txt b/test/115-native-bridge/expected-stdout.txt
similarity index 100%
rename from test/115-native-bridge/expected.txt
rename to test/115-native-bridge/expected-stdout.txt

test/116-nodex2oat/Android.bp

diff --git a/test/116-nodex2oat/Android.bp b/test/116-nodex2oat/Android.bp
index e2a6ba7..91293ad 100644
--- a/test/116-nodex2oat/Android.bp
+++ b/test/116-nodex2oat/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-116-nodex2oat-expected"],
+    data: [":art-run-test-116-nodex2oat-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-116-nodex2oat-expected",
-    out: ["art-run-test-116-nodex2oat-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-116-nodex2oat-expected-stdout",
+    out: ["art-run-test-116-nodex2oat-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/116-nodex2oat/expected-stdout.txt

diff --git a/test/116-nodex2oat/expected.txt b/test/116-nodex2oat/expected-stdout.txt
similarity index 100%
rename from test/116-nodex2oat/expected.txt
rename to test/116-nodex2oat/expected-stdout.txt

test/118-noimage-dex2oat/expected-stdout.txt

diff --git a/test/118-noimage-dex2oat/expected.txt b/test/118-noimage-dex2oat/expected-stdout.txt
similarity index 100%
rename from test/118-noimage-dex2oat/expected.txt
rename to test/118-noimage-dex2oat/expected-stdout.txt

test/120-hashcode/Android.bp

diff --git a/test/120-hashcode/Android.bp b/test/120-hashcode/Android.bp
index 7e60b8e..c15ebcc 100644
--- a/test/120-hashcode/Android.bp
+++ b/test/120-hashcode/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-120-hashcode-expected"],
+    data: [":art-run-test-120-hashcode-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-120-hashcode-expected",
-    out: ["art-run-test-120-hashcode-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-120-hashcode-expected-stdout",
+    out: ["art-run-test-120-hashcode-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/120-hashcode/expected-stdout.txt

diff --git a/test/120-hashcode/expected.txt b/test/120-hashcode/expected-stdout.txt
similarity index 100%
rename from test/120-hashcode/expected.txt
rename to test/120-hashcode/expected-stdout.txt

test/121-modifiers/expected-stdout.txt

diff --git a/test/121-modifiers/expected.txt b/test/121-modifiers/expected-stdout.txt
similarity index 100%
rename from test/121-modifiers/expected.txt
rename to test/121-modifiers/expected-stdout.txt

test/121-simple-suspend-check/Android.bp

diff --git a/test/121-simple-suspend-check/Android.bp b/test/121-simple-suspend-check/Android.bp
index bf25234..7a555cf 100644
--- a/test/121-simple-suspend-check/Android.bp
+++ b/test/121-simple-suspend-check/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-121-simple-suspend-check-expected"],
+    data: [":art-run-test-121-simple-suspend-check-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-121-simple-suspend-check-expected",
-    out: ["art-run-test-121-simple-suspend-check-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-121-simple-suspend-check-expected-stdout",
+    out: ["art-run-test-121-simple-suspend-check-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/121-simple-suspend-check/expected-stdout.txt

diff --git a/test/121-simple-suspend-check/expected.txt b/test/121-simple-suspend-check/expected-stdout.txt
similarity index 100%
rename from test/121-simple-suspend-check/expected.txt
rename to test/121-simple-suspend-check/expected-stdout.txt

test/122-npe/Android.bp

diff --git a/test/122-npe/Android.bp b/test/122-npe/Android.bp
index 1db729c..ef739d4 100644
--- a/test/122-npe/Android.bp
+++ b/test/122-npe/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-122-npe-expected"],
+    data: [":art-run-test-122-npe-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-122-npe-expected",
-    out: ["art-run-test-122-npe-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-122-npe-expected-stdout",
+    out: ["art-run-test-122-npe-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/122-npe/expected-stdout.txt

diff --git a/test/122-npe/expected.txt b/test/122-npe/expected-stdout.txt
similarity index 100%
rename from test/122-npe/expected.txt
rename to test/122-npe/expected-stdout.txt

test/123-compiler-regressions-mt/Android.bp

diff --git a/test/123-compiler-regressions-mt/Android.bp b/test/123-compiler-regressions-mt/Android.bp
index 088b300..41090be 100644
--- a/test/123-compiler-regressions-mt/Android.bp
+++ b/test/123-compiler-regressions-mt/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-123-compiler-regressions-mt-expected"],
+    data: [":art-run-test-123-compiler-regressions-mt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-123-compiler-regressions-mt-expected",
-    out: ["art-run-test-123-compiler-regressions-mt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-123-compiler-regressions-mt-expected-stdout",
+    out: ["art-run-test-123-compiler-regressions-mt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/123-compiler-regressions-mt/expected-stdout.txt

diff --git a/test/123-compiler-regressions-mt/expected.txt b/test/123-compiler-regressions-mt/expected-stdout.txt
similarity index 100%
rename from test/123-compiler-regressions-mt/expected.txt
rename to test/123-compiler-regressions-mt/expected-stdout.txt

test/123-inline-execute2/Android.bp

diff --git a/test/123-inline-execute2/Android.bp b/test/123-inline-execute2/Android.bp
index bb084f2..c7aa8e0 100644
--- a/test/123-inline-execute2/Android.bp
+++ b/test/123-inline-execute2/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-123-inline-execute2-expected"],
+    data: [":art-run-test-123-inline-execute2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-123-inline-execute2-expected",
-    out: ["art-run-test-123-inline-execute2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-123-inline-execute2-expected-stdout",
+    out: ["art-run-test-123-inline-execute2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/123-inline-execute2/expected-stdout.txt

diff --git a/test/123-inline-execute2/expected.txt b/test/123-inline-execute2/expected-stdout.txt
similarity index 100%
rename from test/123-inline-execute2/expected.txt
rename to test/123-inline-execute2/expected-stdout.txt

test/124-missing-classes/expected-stdout.txt

diff --git a/test/124-missing-classes/expected.txt b/test/124-missing-classes/expected-stdout.txt
similarity index 100%
rename from test/124-missing-classes/expected.txt
rename to test/124-missing-classes/expected-stdout.txt

test/125-gc-and-classloading/Android.bp

diff --git a/test/125-gc-and-classloading/Android.bp b/test/125-gc-and-classloading/Android.bp
index fedc5b8..6cc76e1 100644
--- a/test/125-gc-and-classloading/Android.bp
+++ b/test/125-gc-and-classloading/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-125-gc-and-classloading-expected"],
+    data: [":art-run-test-125-gc-and-classloading-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-125-gc-and-classloading-expected",
-    out: ["art-run-test-125-gc-and-classloading-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-125-gc-and-classloading-expected-stdout",
+    out: ["art-run-test-125-gc-and-classloading-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/125-gc-and-classloading/expected-stdout.txt

diff --git a/test/125-gc-and-classloading/expected.txt b/test/125-gc-and-classloading/expected-stdout.txt
similarity index 100%
rename from test/125-gc-and-classloading/expected.txt
rename to test/125-gc-and-classloading/expected-stdout.txt

test/126-miranda-multidex/expected-stdout.txt

diff --git a/test/126-miranda-multidex/expected.txt b/test/126-miranda-multidex/expected-stdout.txt
similarity index 100%
rename from test/126-miranda-multidex/expected.txt
rename to test/126-miranda-multidex/expected-stdout.txt

test/127-checker-secondarydex/expected-stdout.txt

diff --git a/test/127-checker-secondarydex/expected.txt b/test/127-checker-secondarydex/expected-stdout.txt
similarity index 100%
rename from test/127-checker-secondarydex/expected.txt
rename to test/127-checker-secondarydex/expected-stdout.txt

test/128-reg-spill-on-implicit-nullcheck/Android.bp

diff --git a/test/128-reg-spill-on-implicit-nullcheck/Android.bp b/test/128-reg-spill-on-implicit-nullcheck/Android.bp
index 607b627..8195602 100644
--- a/test/128-reg-spill-on-implicit-nullcheck/Android.bp
+++ b/test/128-reg-spill-on-implicit-nullcheck/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-128-reg-spill-on-implicit-nullcheck-expected"],
+    data: [":art-run-test-128-reg-spill-on-implicit-nullcheck-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-128-reg-spill-on-implicit-nullcheck-expected",
-    out: ["art-run-test-128-reg-spill-on-implicit-nullcheck-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-128-reg-spill-on-implicit-nullcheck-expected-stdout",
+    out: ["art-run-test-128-reg-spill-on-implicit-nullcheck-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/128-reg-spill-on-implicit-nullcheck/expected-stdout.txt

diff --git a/test/128-reg-spill-on-implicit-nullcheck/expected.txt b/test/128-reg-spill-on-implicit-nullcheck/expected-stdout.txt
similarity index 100%
rename from test/128-reg-spill-on-implicit-nullcheck/expected.txt
rename to test/128-reg-spill-on-implicit-nullcheck/expected-stdout.txt

test/129-ThreadGetId/Android.bp

diff --git a/test/129-ThreadGetId/Android.bp b/test/129-ThreadGetId/Android.bp
index 19e25c2..a31627a 100644
--- a/test/129-ThreadGetId/Android.bp
+++ b/test/129-ThreadGetId/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-129-ThreadGetId-expected"],
+    data: [":art-run-test-129-ThreadGetId-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-129-ThreadGetId-expected",
-    out: ["art-run-test-129-ThreadGetId-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-129-ThreadGetId-expected-stdout",
+    out: ["art-run-test-129-ThreadGetId-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/129-ThreadGetId/expected-stdout.txt

diff --git a/test/129-ThreadGetId/expected.txt b/test/129-ThreadGetId/expected-stdout.txt
similarity index 100%
rename from test/129-ThreadGetId/expected.txt
rename to test/129-ThreadGetId/expected-stdout.txt

test/130-hprof/expected-stdout.txt

diff --git a/test/130-hprof/expected.txt b/test/130-hprof/expected-stdout.txt
similarity index 100%
rename from test/130-hprof/expected.txt
rename to test/130-hprof/expected-stdout.txt

test/132-daemon-locks-shutdown/Android.bp

diff --git a/test/132-daemon-locks-shutdown/Android.bp b/test/132-daemon-locks-shutdown/Android.bp
index d869591..f3c148e 100644
--- a/test/132-daemon-locks-shutdown/Android.bp
+++ b/test/132-daemon-locks-shutdown/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-132-daemon-locks-shutdown-expected"],
+    data: [":art-run-test-132-daemon-locks-shutdown-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-132-daemon-locks-shutdown-expected",
-    out: ["art-run-test-132-daemon-locks-shutdown-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-132-daemon-locks-shutdown-expected-stdout",
+    out: ["art-run-test-132-daemon-locks-shutdown-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/132-daemon-locks-shutdown/expected-stdout.txt

diff --git a/test/132-daemon-locks-shutdown/expected.txt b/test/132-daemon-locks-shutdown/expected-stdout.txt
similarity index 100%
rename from test/132-daemon-locks-shutdown/expected.txt
rename to test/132-daemon-locks-shutdown/expected-stdout.txt

test/133-static-invoke-super/Android.bp

diff --git a/test/133-static-invoke-super/Android.bp b/test/133-static-invoke-super/Android.bp
index 75717ff..28ea825 100644
--- a/test/133-static-invoke-super/Android.bp
+++ b/test/133-static-invoke-super/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-133-static-invoke-super-expected"],
+    data: [":art-run-test-133-static-invoke-super-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-133-static-invoke-super-expected",
-    out: ["art-run-test-133-static-invoke-super-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-133-static-invoke-super-expected-stdout",
+    out: ["art-run-test-133-static-invoke-super-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/133-static-invoke-super/expected-stdout.txt

diff --git a/test/133-static-invoke-super/expected.txt b/test/133-static-invoke-super/expected-stdout.txt
similarity index 100%
rename from test/133-static-invoke-super/expected.txt
rename to test/133-static-invoke-super/expected-stdout.txt

test/1336-short-finalizer-timeout/Android.bp

diff --git a/test/1336-short-finalizer-timeout/Android.bp b/test/1336-short-finalizer-timeout/Android.bp
index 6ea9e05..6752c41 100644
--- a/test/1336-short-finalizer-timeout/Android.bp
+++ b/test/1336-short-finalizer-timeout/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1336-short-finalizer-timeout-expected"],
+    data: [":art-run-test-1336-short-finalizer-timeout-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1336-short-finalizer-timeout-expected",
-    out: ["art-run-test-1336-short-finalizer-timeout-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1336-short-finalizer-timeout-expected-stdout",
+    out: ["art-run-test-1336-short-finalizer-timeout-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1336-short-finalizer-timeout/expected-stdout.txt

diff --git a/test/1336-short-finalizer-timeout/expected.txt b/test/1336-short-finalizer-timeout/expected-stdout.txt
similarity index 100%
rename from test/1336-short-finalizer-timeout/expected.txt
rename to test/1336-short-finalizer-timeout/expected-stdout.txt

test/1337-gc-coverage/Android.bp

diff --git a/test/1337-gc-coverage/Android.bp b/test/1337-gc-coverage/Android.bp
index 06f3267..1ff6546 100644
--- a/test/1337-gc-coverage/Android.bp
+++ b/test/1337-gc-coverage/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1337-gc-coverage-expected"],
+    data: [":art-run-test-1337-gc-coverage-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1337-gc-coverage-expected",
-    out: ["art-run-test-1337-gc-coverage-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1337-gc-coverage-expected-stdout",
+    out: ["art-run-test-1337-gc-coverage-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1337-gc-coverage/expected-stdout.txt

diff --git a/test/1337-gc-coverage/expected.txt b/test/1337-gc-coverage/expected-stdout.txt
similarity index 100%
rename from test/1337-gc-coverage/expected.txt
rename to test/1337-gc-coverage/expected-stdout.txt

test/1338-gc-no-los/expected-stdout.txt

diff --git a/test/1338-gc-no-los/expected.txt b/test/1338-gc-no-los/expected-stdout.txt
similarity index 100%
rename from test/1338-gc-no-los/expected.txt
rename to test/1338-gc-no-los/expected-stdout.txt

test/1339-dead-reference-safe/Android.bp

diff --git a/test/1339-dead-reference-safe/Android.bp b/test/1339-dead-reference-safe/Android.bp
index f4c14fa..5213167 100644
--- a/test/1339-dead-reference-safe/Android.bp
+++ b/test/1339-dead-reference-safe/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1339-dead-reference-safe-expected"],
+    data: [":art-run-test-1339-dead-reference-safe-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1339-dead-reference-safe-expected",
-    out: ["art-run-test-1339-dead-reference-safe-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1339-dead-reference-safe-expected-stdout",
+    out: ["art-run-test-1339-dead-reference-safe-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1339-dead-reference-safe/expected-stdout.txt

diff --git a/test/1339-dead-reference-safe/expected.txt b/test/1339-dead-reference-safe/expected-stdout.txt
similarity index 100%
rename from test/1339-dead-reference-safe/expected.txt
rename to test/1339-dead-reference-safe/expected-stdout.txt

test/134-reg-promotion/expected-stdout.txt

diff --git a/test/134-reg-promotion/expected.txt b/test/134-reg-promotion/expected-stdout.txt
similarity index 100%
rename from test/134-reg-promotion/expected.txt
rename to test/134-reg-promotion/expected-stdout.txt

test/135-MirandaDispatch/expected-stdout.txt

diff --git a/test/135-MirandaDispatch/expected.txt b/test/135-MirandaDispatch/expected-stdout.txt
similarity index 100%
rename from test/135-MirandaDispatch/expected.txt
rename to test/135-MirandaDispatch/expected-stdout.txt

test/136-daemon-jni-shutdown/Android.bp

diff --git a/test/136-daemon-jni-shutdown/Android.bp b/test/136-daemon-jni-shutdown/Android.bp
index 03c9231..e32e4a6 100644
--- a/test/136-daemon-jni-shutdown/Android.bp
+++ b/test/136-daemon-jni-shutdown/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-136-daemon-jni-shutdown-expected"],
+    data: [":art-run-test-136-daemon-jni-shutdown-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-136-daemon-jni-shutdown-expected",
-    out: ["art-run-test-136-daemon-jni-shutdown-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-136-daemon-jni-shutdown-expected-stdout",
+    out: ["art-run-test-136-daemon-jni-shutdown-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/136-daemon-jni-shutdown/expected-stdout.txt

diff --git a/test/136-daemon-jni-shutdown/expected.txt b/test/136-daemon-jni-shutdown/expected-stdout.txt
similarity index 100%
rename from test/136-daemon-jni-shutdown/expected.txt
rename to test/136-daemon-jni-shutdown/expected-stdout.txt

test/137-cfi/expected-stdout.txt

diff --git a/test/137-cfi/expected.txt b/test/137-cfi/expected-stdout.txt
similarity index 100%
rename from test/137-cfi/expected.txt
rename to test/137-cfi/expected-stdout.txt

test/138-duplicate-classes-check/expected-stdout.txt

diff --git a/test/138-duplicate-classes-check/expected.txt b/test/138-duplicate-classes-check/expected-stdout.txt
similarity index 100%
rename from test/138-duplicate-classes-check/expected.txt
rename to test/138-duplicate-classes-check/expected-stdout.txt

test/138-duplicate-classes-check2/expected-stdout.txt

diff --git a/test/138-duplicate-classes-check2/expected.txt b/test/138-duplicate-classes-check2/expected-stdout.txt
similarity index 100%
rename from test/138-duplicate-classes-check2/expected.txt
rename to test/138-duplicate-classes-check2/expected-stdout.txt

test/139-register-natives/Android.bp

diff --git a/test/139-register-natives/Android.bp b/test/139-register-natives/Android.bp
index b1fc5b8..ba932f2 100644
--- a/test/139-register-natives/Android.bp
+++ b/test/139-register-natives/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-139-register-natives-expected"],
+    data: [":art-run-test-139-register-natives-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-139-register-natives-expected",
-    out: ["art-run-test-139-register-natives-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-139-register-natives-expected-stdout",
+    out: ["art-run-test-139-register-natives-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/139-register-natives/expected-stdout.txt

diff --git a/test/139-register-natives/expected.txt b/test/139-register-natives/expected-stdout.txt
similarity index 100%
rename from test/139-register-natives/expected.txt
rename to test/139-register-natives/expected-stdout.txt

test/140-dce-regression/Android.bp

diff --git a/test/140-dce-regression/Android.bp b/test/140-dce-regression/Android.bp
index 1e90f5a..0a0ca80 100644
--- a/test/140-dce-regression/Android.bp
+++ b/test/140-dce-regression/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-140-dce-regression-expected"],
+    data: [":art-run-test-140-dce-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-140-dce-regression-expected",
-    out: ["art-run-test-140-dce-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-140-dce-regression-expected-stdout",
+    out: ["art-run-test-140-dce-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/140-dce-regression/expected-stdout.txt

diff --git a/test/140-dce-regression/expected.txt b/test/140-dce-regression/expected-stdout.txt
similarity index 100%
rename from test/140-dce-regression/expected.txt
rename to test/140-dce-regression/expected-stdout.txt

test/140-field-packing/Android.bp

diff --git a/test/140-field-packing/Android.bp b/test/140-field-packing/Android.bp
index 2571410..9ea71f8 100644
--- a/test/140-field-packing/Android.bp
+++ b/test/140-field-packing/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-140-field-packing-expected"],
+    data: [":art-run-test-140-field-packing-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-140-field-packing-expected",
-    out: ["art-run-test-140-field-packing-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-140-field-packing-expected-stdout",
+    out: ["art-run-test-140-field-packing-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/140-field-packing/expected-stdout.txt

diff --git a/test/140-field-packing/expected.txt b/test/140-field-packing/expected-stdout.txt
similarity index 100%
rename from test/140-field-packing/expected.txt
rename to test/140-field-packing/expected-stdout.txt

test/141-class-unload/expected-stdout.txt

diff --git a/test/141-class-unload/expected.txt b/test/141-class-unload/expected-stdout.txt
similarity index 100%
rename from test/141-class-unload/expected.txt
rename to test/141-class-unload/expected-stdout.txt

test/142-classloader2/expected-stdout.txt

diff --git a/test/142-classloader2/expected.txt b/test/142-classloader2/expected-stdout.txt
similarity index 100%
rename from test/142-classloader2/expected.txt
rename to test/142-classloader2/expected-stdout.txt

test/143-string-value/Android.bp

diff --git a/test/143-string-value/Android.bp b/test/143-string-value/Android.bp
index 548be9c..0cca620 100644
--- a/test/143-string-value/Android.bp
+++ b/test/143-string-value/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-143-string-value-expected"],
+    data: [":art-run-test-143-string-value-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-143-string-value-expected",
-    out: ["art-run-test-143-string-value-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-143-string-value-expected-stdout",
+    out: ["art-run-test-143-string-value-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/143-string-value/expected-stdout.txt

diff --git a/test/143-string-value/expected.txt b/test/143-string-value/expected-stdout.txt
similarity index 100%
rename from test/143-string-value/expected.txt
rename to test/143-string-value/expected-stdout.txt

test/144-static-field-sigquit/Android.bp

diff --git a/test/144-static-field-sigquit/Android.bp b/test/144-static-field-sigquit/Android.bp
index d92ad36..4334896 100644
--- a/test/144-static-field-sigquit/Android.bp
+++ b/test/144-static-field-sigquit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-144-static-field-sigquit-expected"],
+    data: [":art-run-test-144-static-field-sigquit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-144-static-field-sigquit-expected",
-    out: ["art-run-test-144-static-field-sigquit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-144-static-field-sigquit-expected-stdout",
+    out: ["art-run-test-144-static-field-sigquit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/144-static-field-sigquit/expected-stdout.txt

diff --git a/test/144-static-field-sigquit/expected.txt b/test/144-static-field-sigquit/expected-stdout.txt
similarity index 100%
rename from test/144-static-field-sigquit/expected.txt
rename to test/144-static-field-sigquit/expected-stdout.txt

test/145-alloc-tracking-stress/expected-stdout.txt

diff --git a/test/145-alloc-tracking-stress/expected.txt b/test/145-alloc-tracking-stress/expected-stdout.txt
similarity index 100%
rename from test/145-alloc-tracking-stress/expected.txt
rename to test/145-alloc-tracking-stress/expected-stdout.txt

test/146-bad-interface/expected-stdout.txt

diff --git a/test/146-bad-interface/expected.txt b/test/146-bad-interface/expected-stdout.txt
similarity index 100%
rename from test/146-bad-interface/expected.txt
rename to test/146-bad-interface/expected-stdout.txt

test/148-multithread-gc-annotations/Android.bp

diff --git a/test/148-multithread-gc-annotations/Android.bp b/test/148-multithread-gc-annotations/Android.bp
index c54e9d3..3cdf02a 100644
--- a/test/148-multithread-gc-annotations/Android.bp
+++ b/test/148-multithread-gc-annotations/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-148-multithread-gc-annotations-expected"],
+    data: [":art-run-test-148-multithread-gc-annotations-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-148-multithread-gc-annotations-expected",
-    out: ["art-run-test-148-multithread-gc-annotations-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-148-multithread-gc-annotations-expected-stdout",
+    out: ["art-run-test-148-multithread-gc-annotations-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/148-multithread-gc-annotations/expected-stdout.txt

diff --git a/test/148-multithread-gc-annotations/expected.txt b/test/148-multithread-gc-annotations/expected-stdout.txt
similarity index 100%
rename from test/148-multithread-gc-annotations/expected.txt
rename to test/148-multithread-gc-annotations/expected-stdout.txt

test/149-suspend-all-stress/Android.bp

diff --git a/test/149-suspend-all-stress/Android.bp b/test/149-suspend-all-stress/Android.bp
index b5077c7..8745cc7 100644
--- a/test/149-suspend-all-stress/Android.bp
+++ b/test/149-suspend-all-stress/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-149-suspend-all-stress-expected"],
+    data: [":art-run-test-149-suspend-all-stress-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-149-suspend-all-stress-expected",
-    out: ["art-run-test-149-suspend-all-stress-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-149-suspend-all-stress-expected-stdout",
+    out: ["art-run-test-149-suspend-all-stress-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/149-suspend-all-stress/expected-stdout.txt

diff --git a/test/149-suspend-all-stress/expected.txt b/test/149-suspend-all-stress/expected-stdout.txt
similarity index 100%
rename from test/149-suspend-all-stress/expected.txt
rename to test/149-suspend-all-stress/expected-stdout.txt

test/150-loadlibrary/Android.bp

diff --git a/test/150-loadlibrary/Android.bp b/test/150-loadlibrary/Android.bp
index feb71aa..ac773ec 100644
--- a/test/150-loadlibrary/Android.bp
+++ b/test/150-loadlibrary/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-150-loadlibrary-expected"],
+    data: [":art-run-test-150-loadlibrary-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-150-loadlibrary-expected",
-    out: ["art-run-test-150-loadlibrary-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-150-loadlibrary-expected-stdout",
+    out: ["art-run-test-150-loadlibrary-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/150-loadlibrary/expected-stdout.txt

diff --git a/test/150-loadlibrary/expected.txt b/test/150-loadlibrary/expected-stdout.txt
similarity index 100%
rename from test/150-loadlibrary/expected.txt
rename to test/150-loadlibrary/expected-stdout.txt

test/151-OpenFileLimit/Android.bp

diff --git a/test/151-OpenFileLimit/Android.bp b/test/151-OpenFileLimit/Android.bp
index fa9caf9..748795e 100644
--- a/test/151-OpenFileLimit/Android.bp
+++ b/test/151-OpenFileLimit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-151-OpenFileLimit-expected"],
+    data: [":art-run-test-151-OpenFileLimit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-151-OpenFileLimit-expected",
-    out: ["art-run-test-151-OpenFileLimit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-151-OpenFileLimit-expected-stdout",
+    out: ["art-run-test-151-OpenFileLimit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/151-OpenFileLimit/expected-stdout.txt

diff --git a/test/151-OpenFileLimit/expected.txt b/test/151-OpenFileLimit/expected-stdout.txt
similarity index 100%
rename from test/151-OpenFileLimit/expected.txt
rename to test/151-OpenFileLimit/expected-stdout.txt

test/152-dead-large-object/Android.bp

diff --git a/test/152-dead-large-object/Android.bp b/test/152-dead-large-object/Android.bp
index fa030ea..2444fa5 100644
--- a/test/152-dead-large-object/Android.bp
+++ b/test/152-dead-large-object/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-152-dead-large-object-expected"],
+    data: [":art-run-test-152-dead-large-object-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-152-dead-large-object-expected",
-    out: ["art-run-test-152-dead-large-object-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-152-dead-large-object-expected-stdout",
+    out: ["art-run-test-152-dead-large-object-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/152-dead-large-object/expected-stdout.txt

diff --git a/test/152-dead-large-object/expected.txt b/test/152-dead-large-object/expected-stdout.txt
similarity index 100%
rename from test/152-dead-large-object/expected.txt
rename to test/152-dead-large-object/expected-stdout.txt

test/153-reference-stress/Android.bp

diff --git a/test/153-reference-stress/Android.bp b/test/153-reference-stress/Android.bp
index cdc0dd2..04ab5d2 100644
--- a/test/153-reference-stress/Android.bp
+++ b/test/153-reference-stress/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-153-reference-stress-expected"],
+    data: [":art-run-test-153-reference-stress-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-153-reference-stress-expected",
-    out: ["art-run-test-153-reference-stress-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-153-reference-stress-expected-stdout",
+    out: ["art-run-test-153-reference-stress-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/153-reference-stress/expected-stdout.txt

diff --git a/test/153-reference-stress/expected.txt b/test/153-reference-stress/expected-stdout.txt
similarity index 100%
rename from test/153-reference-stress/expected.txt
rename to test/153-reference-stress/expected-stdout.txt

test/154-gc-loop/Android.bp

diff --git a/test/154-gc-loop/Android.bp b/test/154-gc-loop/Android.bp
index e0f5955..2073e8b 100644
--- a/test/154-gc-loop/Android.bp
+++ b/test/154-gc-loop/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-154-gc-loop-expected"],
+    data: [":art-run-test-154-gc-loop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-154-gc-loop-expected",
-    out: ["art-run-test-154-gc-loop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-154-gc-loop-expected-stdout",
+    out: ["art-run-test-154-gc-loop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/154-gc-loop/expected-stdout.txt

diff --git a/test/154-gc-loop/expected.txt b/test/154-gc-loop/expected-stdout.txt
similarity index 100%
rename from test/154-gc-loop/expected.txt
rename to test/154-gc-loop/expected-stdout.txt

test/155-java-set-resolved-type/expected-stdout.txt

diff --git a/test/155-java-set-resolved-type/expected.txt b/test/155-java-set-resolved-type/expected-stdout.txt
similarity index 100%
rename from test/155-java-set-resolved-type/expected.txt
rename to test/155-java-set-resolved-type/expected-stdout.txt

test/155-java-set-resolved-type/src/Main.java

diff --git a/test/155-java-set-resolved-type/src/Main.java b/test/155-java-set-resolved-type/src/Main.java
index 44278a1..45f6737 100644
--- a/test/155-java-set-resolved-type/src/Main.java
+++ b/test/155-java-set-resolved-type/src/Main.java
@@ -26,7 +26,7 @@
             System.loadLibrary(args[0]);
         } catch (ClassNotFoundException e) {
             usingRI = true;
-            // Add expected JNI_OnLoad log line to match expected.txt.
+            // Add expected JNI_OnLoad log line to match expected-stdout.txt.
             System.out.println("JNI_OnLoad called");
         }
         try {

test/156-register-dex-file-multi-loader/Android.bp

diff --git a/test/156-register-dex-file-multi-loader/Android.bp b/test/156-register-dex-file-multi-loader/Android.bp
index 2ccebee..62accd2 100644
--- a/test/156-register-dex-file-multi-loader/Android.bp
+++ b/test/156-register-dex-file-multi-loader/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-156-register-dex-file-multi-loader-expected"],
+    data: [":art-run-test-156-register-dex-file-multi-loader-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-156-register-dex-file-multi-loader-expected",
-    out: ["art-run-test-156-register-dex-file-multi-loader-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-156-register-dex-file-multi-loader-expected-stdout",
+    out: ["art-run-test-156-register-dex-file-multi-loader-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/156-register-dex-file-multi-loader/expected-stdout.txt

diff --git a/test/156-register-dex-file-multi-loader/expected.txt b/test/156-register-dex-file-multi-loader/expected-stdout.txt
similarity index 100%
rename from test/156-register-dex-file-multi-loader/expected.txt
rename to test/156-register-dex-file-multi-loader/expected-stdout.txt

test/157-void-class/expected-stdout.txt

diff --git a/test/157-void-class/expected.txt b/test/157-void-class/expected-stdout.txt
similarity index 100%
rename from test/157-void-class/expected.txt
rename to test/157-void-class/expected-stdout.txt

test/157-void-class/src-art/Main.java

diff --git a/test/157-void-class/src-art/Main.java b/test/157-void-class/src-art/Main.java
index 322b705..25e3eba 100644
--- a/test/157-void-class/src-art/Main.java
+++ b/test/157-void-class/src-art/Main.java
@@ -24,7 +24,7 @@
             System.loadLibrary(args[0]);
         } catch (ClassNotFoundException e) {
             usingRI = true;
-            // Add expected JNI_OnLoad log line to match expected.txt.
+            // Add expected JNI_OnLoad log line to match expected-stdout.txt.
             System.out.println("JNI_OnLoad called");
         }
         try {

test/158-app-image-class-table/Android.bp

diff --git a/test/158-app-image-class-table/Android.bp b/test/158-app-image-class-table/Android.bp
index a6bedba..eb9c48c 100644
--- a/test/158-app-image-class-table/Android.bp
+++ b/test/158-app-image-class-table/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-158-app-image-class-table-expected"],
+    data: [":art-run-test-158-app-image-class-table-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-158-app-image-class-table-expected",
-    out: ["art-run-test-158-app-image-class-table-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-158-app-image-class-table-expected-stdout",
+    out: ["art-run-test-158-app-image-class-table-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/158-app-image-class-table/expected-stdout.txt

diff --git a/test/158-app-image-class-table/expected.txt b/test/158-app-image-class-table/expected-stdout.txt
similarity index 100%
rename from test/158-app-image-class-table/expected.txt
rename to test/158-app-image-class-table/expected-stdout.txt

test/158-app-image-class-table/src/Main.java

diff --git a/test/158-app-image-class-table/src/Main.java b/test/158-app-image-class-table/src/Main.java
index 97aa14d..f427431 100644
--- a/test/158-app-image-class-table/src/Main.java
+++ b/test/158-app-image-class-table/src/Main.java
@@ -23,7 +23,7 @@
             System.loadLibrary(args[0]);
         } catch (ClassNotFoundException e) {
             usingRI = true;
-            // Add expected JNI_OnLoad log line to match expected.txt.
+            // Add expected JNI_OnLoad log line to match expected-stdout.txt.
             System.out.println("JNI_OnLoad called");
         }
         try {

test/159-app-image-fields/Android.bp

diff --git a/test/159-app-image-fields/Android.bp b/test/159-app-image-fields/Android.bp
index 471854c..7b1a9c2 100644
--- a/test/159-app-image-fields/Android.bp
+++ b/test/159-app-image-fields/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-159-app-image-fields-expected"],
+    data: [":art-run-test-159-app-image-fields-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-159-app-image-fields-expected",
-    out: ["art-run-test-159-app-image-fields-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-159-app-image-fields-expected-stdout",
+    out: ["art-run-test-159-app-image-fields-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/159-app-image-fields/expected-stdout.txt

diff --git a/test/159-app-image-fields/expected.txt b/test/159-app-image-fields/expected-stdout.txt
similarity index 100%
rename from test/159-app-image-fields/expected.txt
rename to test/159-app-image-fields/expected-stdout.txt

test/160-read-barrier-stress/Android.bp

diff --git a/test/160-read-barrier-stress/Android.bp b/test/160-read-barrier-stress/Android.bp
index c83dd93..234801d 100644
--- a/test/160-read-barrier-stress/Android.bp
+++ b/test/160-read-barrier-stress/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-160-read-barrier-stress-expected"],
+    data: [":art-run-test-160-read-barrier-stress-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-160-read-barrier-stress-expected",
-    out: ["art-run-test-160-read-barrier-stress-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-160-read-barrier-stress-expected-stdout",
+    out: ["art-run-test-160-read-barrier-stress-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/160-read-barrier-stress/expected-stdout.txt

diff --git a/test/160-read-barrier-stress/expected.txt b/test/160-read-barrier-stress/expected-stdout.txt
similarity index 100%
rename from test/160-read-barrier-stress/expected.txt
rename to test/160-read-barrier-stress/expected-stdout.txt

test/161-final-abstract-class/expected-stdout.txt

diff --git a/test/161-final-abstract-class/expected.txt b/test/161-final-abstract-class/expected-stdout.txt
similarity index 100%
rename from test/161-final-abstract-class/expected.txt
rename to test/161-final-abstract-class/expected-stdout.txt

test/162-method-resolution/expected-stdout.txt

diff --git a/test/162-method-resolution/expected.txt b/test/162-method-resolution/expected-stdout.txt
similarity index 100%
rename from test/162-method-resolution/expected.txt
rename to test/162-method-resolution/expected-stdout.txt

test/162-method-resolution/src/Main.java

diff --git a/test/162-method-resolution/src/Main.java b/test/162-method-resolution/src/Main.java
index 864c878..2a84fe6 100644
--- a/test/162-method-resolution/src/Main.java
+++ b/test/162-method-resolution/src/Main.java
@@ -312,7 +312,7 @@
         } else {
             invokeUserTest("Test7User");
             // For ART, just print the expected output to hide the divergence. Bug: 63624936.
-            // The expected.txt lists the desired behavior, not the current behavior.
+            // The expected-stdout.txt lists the desired behavior, not the current behavior.
             System.out.println("Calling Test7User2.test():\n" +
                                "Caught java.lang.reflect.InvocationTargetException\n" +
                                "  caused by java.lang.IllegalAccessError");

test/163-app-image-methods/Android.bp

diff --git a/test/163-app-image-methods/Android.bp b/test/163-app-image-methods/Android.bp
index bc3676a..2bbb251 100644
--- a/test/163-app-image-methods/Android.bp
+++ b/test/163-app-image-methods/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-163-app-image-methods-expected"],
+    data: [":art-run-test-163-app-image-methods-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-163-app-image-methods-expected",
-    out: ["art-run-test-163-app-image-methods-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-163-app-image-methods-expected-stdout",
+    out: ["art-run-test-163-app-image-methods-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/163-app-image-methods/expected-stdout.txt

diff --git a/test/163-app-image-methods/expected.txt b/test/163-app-image-methods/expected-stdout.txt
similarity index 100%
rename from test/163-app-image-methods/expected.txt
rename to test/163-app-image-methods/expected-stdout.txt

test/164-resolution-trampoline-dex-cache/expected-stdout.txt

diff --git a/test/164-resolution-trampoline-dex-cache/expected.txt b/test/164-resolution-trampoline-dex-cache/expected-stdout.txt
similarity index 100%
rename from test/164-resolution-trampoline-dex-cache/expected.txt
rename to test/164-resolution-trampoline-dex-cache/expected-stdout.txt

test/165-lock-owner-proxy/Android.bp

diff --git a/test/165-lock-owner-proxy/Android.bp b/test/165-lock-owner-proxy/Android.bp
index 4a12cfd..c7b3212 100644
--- a/test/165-lock-owner-proxy/Android.bp
+++ b/test/165-lock-owner-proxy/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-165-lock-owner-proxy-expected"],
+    data: [":art-run-test-165-lock-owner-proxy-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-165-lock-owner-proxy-expected",
-    out: ["art-run-test-165-lock-owner-proxy-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-165-lock-owner-proxy-expected-stdout",
+    out: ["art-run-test-165-lock-owner-proxy-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/165-lock-owner-proxy/expected-stdout.txt

diff --git a/test/165-lock-owner-proxy/expected.txt b/test/165-lock-owner-proxy/expected-stdout.txt
similarity index 100%
rename from test/165-lock-owner-proxy/expected.txt
rename to test/165-lock-owner-proxy/expected-stdout.txt

test/166-bad-interface-super/expected-stdout.txt

diff --git a/test/166-bad-interface-super/expected.txt b/test/166-bad-interface-super/expected-stdout.txt
similarity index 100%
rename from test/166-bad-interface-super/expected.txt
rename to test/166-bad-interface-super/expected-stdout.txt

test/167-visit-locks/expected-stdout.txt

diff --git a/test/167-visit-locks/expected.txt b/test/167-visit-locks/expected-stdout.txt
similarity index 100%
rename from test/167-visit-locks/expected.txt
rename to test/167-visit-locks/expected-stdout.txt

test/168-vmstack-annotated/Android.bp

diff --git a/test/168-vmstack-annotated/Android.bp b/test/168-vmstack-annotated/Android.bp
index 6353961..8f04a69 100644
--- a/test/168-vmstack-annotated/Android.bp
+++ b/test/168-vmstack-annotated/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-168-vmstack-annotated-expected"],
+    data: [":art-run-test-168-vmstack-annotated-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-168-vmstack-annotated-expected",
-    out: ["art-run-test-168-vmstack-annotated-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-168-vmstack-annotated-expected-stdout",
+    out: ["art-run-test-168-vmstack-annotated-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/168-vmstack-annotated/expected-stdout.txt

diff --git a/test/168-vmstack-annotated/expected.txt b/test/168-vmstack-annotated/expected-stdout.txt
similarity index 100%
rename from test/168-vmstack-annotated/expected.txt
rename to test/168-vmstack-annotated/expected-stdout.txt

test/169-threadgroup-jni/Android.bp

diff --git a/test/169-threadgroup-jni/Android.bp b/test/169-threadgroup-jni/Android.bp
index 7a82116..7a82613 100644
--- a/test/169-threadgroup-jni/Android.bp
+++ b/test/169-threadgroup-jni/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-169-threadgroup-jni-expected"],
+    data: [":art-run-test-169-threadgroup-jni-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-169-threadgroup-jni-expected",
-    out: ["art-run-test-169-threadgroup-jni-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-169-threadgroup-jni-expected-stdout",
+    out: ["art-run-test-169-threadgroup-jni-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/169-threadgroup-jni/expected-stdout.txt

diff --git a/test/169-threadgroup-jni/expected.txt b/test/169-threadgroup-jni/expected-stdout.txt
similarity index 100%
rename from test/169-threadgroup-jni/expected.txt
rename to test/169-threadgroup-jni/expected-stdout.txt

test/170-interface-init/Android.bp

diff --git a/test/170-interface-init/Android.bp b/test/170-interface-init/Android.bp
index f9b6b51..dee00f5 100644
--- a/test/170-interface-init/Android.bp
+++ b/test/170-interface-init/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-170-interface-init-expected"],
+    data: [":art-run-test-170-interface-init-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-170-interface-init-expected",
-    out: ["art-run-test-170-interface-init-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-170-interface-init-expected-stdout",
+    out: ["art-run-test-170-interface-init-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/170-interface-init/expected-stdout.txt

diff --git a/test/170-interface-init/expected.txt b/test/170-interface-init/expected-stdout.txt
similarity index 100%
rename from test/170-interface-init/expected.txt
rename to test/170-interface-init/expected-stdout.txt

test/171-init-aste/expected-stdout.txt

diff --git a/test/171-init-aste/expected.txt b/test/171-init-aste/expected-stdout.txt
similarity index 100%
rename from test/171-init-aste/expected.txt
rename to test/171-init-aste/expected-stdout.txt

test/172-app-image-twice/Android.bp

diff --git a/test/172-app-image-twice/Android.bp b/test/172-app-image-twice/Android.bp
index 5989be1..10f1b19 100644
--- a/test/172-app-image-twice/Android.bp
+++ b/test/172-app-image-twice/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-172-app-image-twice-expected"],
+    data: [":art-run-test-172-app-image-twice-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-172-app-image-twice-expected",
-    out: ["art-run-test-172-app-image-twice-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-172-app-image-twice-expected-stdout",
+    out: ["art-run-test-172-app-image-twice-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/172-app-image-twice/expected-stdout.txt

diff --git a/test/172-app-image-twice/expected.txt b/test/172-app-image-twice/expected-stdout.txt
similarity index 100%
rename from test/172-app-image-twice/expected.txt
rename to test/172-app-image-twice/expected-stdout.txt

test/173-missing-field-type/expected-stdout.txt

diff --git a/test/173-missing-field-type/expected.txt b/test/173-missing-field-type/expected-stdout.txt
similarity index 100%
rename from test/173-missing-field-type/expected.txt
rename to test/173-missing-field-type/expected-stdout.txt

test/174-escaping-instance-of-bad-class/Android.bp

diff --git a/test/174-escaping-instance-of-bad-class/Android.bp b/test/174-escaping-instance-of-bad-class/Android.bp
index 71826d8..7d04601 100644
--- a/test/174-escaping-instance-of-bad-class/Android.bp
+++ b/test/174-escaping-instance-of-bad-class/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-174-escaping-instance-of-bad-class-expected"],
+    data: [":art-run-test-174-escaping-instance-of-bad-class-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-174-escaping-instance-of-bad-class-expected",
-    out: ["art-run-test-174-escaping-instance-of-bad-class-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-174-escaping-instance-of-bad-class-expected-stdout",
+    out: ["art-run-test-174-escaping-instance-of-bad-class-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/174-escaping-instance-of-bad-class/expected-stdout.txt

diff --git a/test/174-escaping-instance-of-bad-class/expected.txt b/test/174-escaping-instance-of-bad-class/expected-stdout.txt
similarity index 100%
rename from test/174-escaping-instance-of-bad-class/expected.txt
rename to test/174-escaping-instance-of-bad-class/expected-stdout.txt

test/175-alloc-big-bignums/Android.bp

diff --git a/test/175-alloc-big-bignums/Android.bp b/test/175-alloc-big-bignums/Android.bp
index 7284fc7..e0eb298 100644
--- a/test/175-alloc-big-bignums/Android.bp
+++ b/test/175-alloc-big-bignums/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-175-alloc-big-bignums-expected"],
+    data: [":art-run-test-175-alloc-big-bignums-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-175-alloc-big-bignums-expected",
-    out: ["art-run-test-175-alloc-big-bignums-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-175-alloc-big-bignums-expected-stdout",
+    out: ["art-run-test-175-alloc-big-bignums-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/175-alloc-big-bignums/expected-stdout.txt

diff --git a/test/175-alloc-big-bignums/expected.txt b/test/175-alloc-big-bignums/expected-stdout.txt
similarity index 100%
rename from test/175-alloc-big-bignums/expected.txt
rename to test/175-alloc-big-bignums/expected-stdout.txt

test/176-app-image-string/Android.bp

diff --git a/test/176-app-image-string/Android.bp b/test/176-app-image-string/Android.bp
index 5e6185c..f032c7e 100644
--- a/test/176-app-image-string/Android.bp
+++ b/test/176-app-image-string/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-176-app-image-string-expected"],
+    data: [":art-run-test-176-app-image-string-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-176-app-image-string-expected",
-    out: ["art-run-test-176-app-image-string-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-176-app-image-string-expected-stdout",
+    out: ["art-run-test-176-app-image-string-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/176-app-image-string/expected-stdout.txt

diff --git a/test/176-app-image-string/expected.txt b/test/176-app-image-string/expected-stdout.txt
similarity index 100%
rename from test/176-app-image-string/expected.txt
rename to test/176-app-image-string/expected-stdout.txt

test/177-visibly-initialized-deadlock/Android.bp

diff --git a/test/177-visibly-initialized-deadlock/Android.bp b/test/177-visibly-initialized-deadlock/Android.bp
index 0ee52c0..2c2d1e4 100644
--- a/test/177-visibly-initialized-deadlock/Android.bp
+++ b/test/177-visibly-initialized-deadlock/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-177-visibly-initialized-deadlock-expected"],
+    data: [":art-run-test-177-visibly-initialized-deadlock-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-177-visibly-initialized-deadlock-expected",
-    out: ["art-run-test-177-visibly-initialized-deadlock-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-177-visibly-initialized-deadlock-expected-stdout",
+    out: ["art-run-test-177-visibly-initialized-deadlock-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/177-visibly-initialized-deadlock/expected-stdout.txt

diff --git a/test/177-visibly-initialized-deadlock/expected.txt b/test/177-visibly-initialized-deadlock/expected-stdout.txt
similarity index 100%
rename from test/177-visibly-initialized-deadlock/expected.txt
rename to test/177-visibly-initialized-deadlock/expected-stdout.txt

test/178-app-image-native-method/Android.bp

diff --git a/test/178-app-image-native-method/Android.bp b/test/178-app-image-native-method/Android.bp
index 58ffea3..62a9afb 100644
--- a/test/178-app-image-native-method/Android.bp
+++ b/test/178-app-image-native-method/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-178-app-image-native-method-expected"],
+    data: [":art-run-test-178-app-image-native-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-178-app-image-native-method-expected",
-    out: ["art-run-test-178-app-image-native-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-178-app-image-native-method-expected-stdout",
+    out: ["art-run-test-178-app-image-native-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/178-app-image-native-method/expected-stdout.txt

diff --git a/test/178-app-image-native-method/expected.txt b/test/178-app-image-native-method/expected-stdout.txt
similarity index 100%
rename from test/178-app-image-native-method/expected.txt
rename to test/178-app-image-native-method/expected-stdout.txt

test/179-nonvirtual-jni/Android.bp

diff --git a/test/179-nonvirtual-jni/Android.bp b/test/179-nonvirtual-jni/Android.bp
index a3f8c7e..1a93cc0 100644
--- a/test/179-nonvirtual-jni/Android.bp
+++ b/test/179-nonvirtual-jni/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-179-nonvirtual-jni-expected"],
+    data: [":art-run-test-179-nonvirtual-jni-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-179-nonvirtual-jni-expected",
-    out: ["art-run-test-179-nonvirtual-jni-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-179-nonvirtual-jni-expected-stdout",
+    out: ["art-run-test-179-nonvirtual-jni-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/179-nonvirtual-jni/expected-stdout.txt

diff --git a/test/179-nonvirtual-jni/expected.txt b/test/179-nonvirtual-jni/expected-stdout.txt
similarity index 100%
rename from test/179-nonvirtual-jni/expected.txt
rename to test/179-nonvirtual-jni/expected-stdout.txt

test/180-native-default-method/expected-stdout.txt

diff --git a/test/180-native-default-method/expected.txt b/test/180-native-default-method/expected-stdout.txt
similarity index 100%
rename from test/180-native-default-method/expected.txt
rename to test/180-native-default-method/expected-stdout.txt

test/1900-track-alloc/Android.bp

diff --git a/test/1900-track-alloc/Android.bp b/test/1900-track-alloc/Android.bp
index 866e76b..899a369 100644
--- a/test/1900-track-alloc/Android.bp
+++ b/test/1900-track-alloc/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1900-track-alloc-expected"],
+    data: [":art-run-test-1900-track-alloc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1900-track-alloc-expected",
-    out: ["art-run-test-1900-track-alloc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1900-track-alloc-expected-stdout",
+    out: ["art-run-test-1900-track-alloc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1900-track-alloc/expected-stdout.txt

diff --git a/test/1900-track-alloc/expected.txt b/test/1900-track-alloc/expected-stdout.txt
similarity index 100%
rename from test/1900-track-alloc/expected.txt
rename to test/1900-track-alloc/expected-stdout.txt

test/1901-get-bytecodes/Android.bp

diff --git a/test/1901-get-bytecodes/Android.bp b/test/1901-get-bytecodes/Android.bp
index fa3c57e..8d46b09 100644
--- a/test/1901-get-bytecodes/Android.bp
+++ b/test/1901-get-bytecodes/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1901-get-bytecodes-expected"],
+    data: [":art-run-test-1901-get-bytecodes-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1901-get-bytecodes-expected",
-    out: ["art-run-test-1901-get-bytecodes-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1901-get-bytecodes-expected-stdout",
+    out: ["art-run-test-1901-get-bytecodes-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1901-get-bytecodes/expected-stdout.txt

diff --git a/test/1901-get-bytecodes/expected.txt b/test/1901-get-bytecodes/expected-stdout.txt
similarity index 100%
rename from test/1901-get-bytecodes/expected.txt
rename to test/1901-get-bytecodes/expected-stdout.txt

test/1902-suspend/Android.bp

diff --git a/test/1902-suspend/Android.bp b/test/1902-suspend/Android.bp
index 987bc24..211ddea 100644
--- a/test/1902-suspend/Android.bp
+++ b/test/1902-suspend/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1902-suspend-expected"],
+    data: [":art-run-test-1902-suspend-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1902-suspend-expected",
-    out: ["art-run-test-1902-suspend-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1902-suspend-expected-stdout",
+    out: ["art-run-test-1902-suspend-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1902-suspend/expected-stdout.txt

diff --git a/test/1902-suspend/expected.txt b/test/1902-suspend/expected-stdout.txt
similarity index 100%
rename from test/1902-suspend/expected.txt
rename to test/1902-suspend/expected-stdout.txt

test/1903-suspend-self/Android.bp

diff --git a/test/1903-suspend-self/Android.bp b/test/1903-suspend-self/Android.bp
index 67ca9b4..6914be3 100644
--- a/test/1903-suspend-self/Android.bp
+++ b/test/1903-suspend-self/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1903-suspend-self-expected"],
+    data: [":art-run-test-1903-suspend-self-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1903-suspend-self-expected",
-    out: ["art-run-test-1903-suspend-self-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1903-suspend-self-expected-stdout",
+    out: ["art-run-test-1903-suspend-self-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1903-suspend-self/expected-stdout.txt

diff --git a/test/1903-suspend-self/expected.txt b/test/1903-suspend-self/expected-stdout.txt
similarity index 100%
rename from test/1903-suspend-self/expected.txt
rename to test/1903-suspend-self/expected-stdout.txt

test/1904-double-suspend/Android.bp

diff --git a/test/1904-double-suspend/Android.bp b/test/1904-double-suspend/Android.bp
index 44b8b86..0abf3f7 100644
--- a/test/1904-double-suspend/Android.bp
+++ b/test/1904-double-suspend/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1904-double-suspend-expected"],
+    data: [":art-run-test-1904-double-suspend-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1904-double-suspend-expected",
-    out: ["art-run-test-1904-double-suspend-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1904-double-suspend-expected-stdout",
+    out: ["art-run-test-1904-double-suspend-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1904-double-suspend/expected-stdout.txt

diff --git a/test/1904-double-suspend/expected.txt b/test/1904-double-suspend/expected-stdout.txt
similarity index 100%
rename from test/1904-double-suspend/expected.txt
rename to test/1904-double-suspend/expected-stdout.txt

test/1905-suspend-native/Android.bp

diff --git a/test/1905-suspend-native/Android.bp b/test/1905-suspend-native/Android.bp
index 35a7a5e..382b96a 100644
--- a/test/1905-suspend-native/Android.bp
+++ b/test/1905-suspend-native/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1905-suspend-native-expected"],
+    data: [":art-run-test-1905-suspend-native-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1905-suspend-native-expected",
-    out: ["art-run-test-1905-suspend-native-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1905-suspend-native-expected-stdout",
+    out: ["art-run-test-1905-suspend-native-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1905-suspend-native/expected-stdout.txt

diff --git a/test/1905-suspend-native/expected.txt b/test/1905-suspend-native/expected-stdout.txt
similarity index 100%
rename from test/1905-suspend-native/expected.txt
rename to test/1905-suspend-native/expected-stdout.txt

test/1906-suspend-list-me-first/Android.bp

diff --git a/test/1906-suspend-list-me-first/Android.bp b/test/1906-suspend-list-me-first/Android.bp
index a900ca8..377fdcc 100644
--- a/test/1906-suspend-list-me-first/Android.bp
+++ b/test/1906-suspend-list-me-first/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1906-suspend-list-me-first-expected"],
+    data: [":art-run-test-1906-suspend-list-me-first-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1906-suspend-list-me-first-expected",
-    out: ["art-run-test-1906-suspend-list-me-first-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1906-suspend-list-me-first-expected-stdout",
+    out: ["art-run-test-1906-suspend-list-me-first-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1906-suspend-list-me-first/expected-stdout.txt

diff --git a/test/1906-suspend-list-me-first/expected.txt b/test/1906-suspend-list-me-first/expected-stdout.txt
similarity index 100%
rename from test/1906-suspend-list-me-first/expected.txt
rename to test/1906-suspend-list-me-first/expected-stdout.txt

test/1907-suspend-list-self-twice/Android.bp

diff --git a/test/1907-suspend-list-self-twice/Android.bp b/test/1907-suspend-list-self-twice/Android.bp
index 8ef235f..0985684 100644
--- a/test/1907-suspend-list-self-twice/Android.bp
+++ b/test/1907-suspend-list-self-twice/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1907-suspend-list-self-twice-expected"],
+    data: [":art-run-test-1907-suspend-list-self-twice-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1907-suspend-list-self-twice-expected",
-    out: ["art-run-test-1907-suspend-list-self-twice-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1907-suspend-list-self-twice-expected-stdout",
+    out: ["art-run-test-1907-suspend-list-self-twice-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1907-suspend-list-self-twice/expected-stdout.txt

diff --git a/test/1907-suspend-list-self-twice/expected.txt b/test/1907-suspend-list-self-twice/expected-stdout.txt
similarity index 100%
rename from test/1907-suspend-list-self-twice/expected.txt
rename to test/1907-suspend-list-self-twice/expected-stdout.txt

test/1908-suspend-native-resume-self/Android.bp

diff --git a/test/1908-suspend-native-resume-self/Android.bp b/test/1908-suspend-native-resume-self/Android.bp
index 845872d..24f60d7 100644
--- a/test/1908-suspend-native-resume-self/Android.bp
+++ b/test/1908-suspend-native-resume-self/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1908-suspend-native-resume-self-expected"],
+    data: [":art-run-test-1908-suspend-native-resume-self-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1908-suspend-native-resume-self-expected",
-    out: ["art-run-test-1908-suspend-native-resume-self-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1908-suspend-native-resume-self-expected-stdout",
+    out: ["art-run-test-1908-suspend-native-resume-self-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1908-suspend-native-resume-self/expected-stdout.txt

diff --git a/test/1908-suspend-native-resume-self/expected.txt b/test/1908-suspend-native-resume-self/expected-stdout.txt
similarity index 100%
rename from test/1908-suspend-native-resume-self/expected.txt
rename to test/1908-suspend-native-resume-self/expected-stdout.txt

test/1909-per-agent-tls/Android.bp

diff --git a/test/1909-per-agent-tls/Android.bp b/test/1909-per-agent-tls/Android.bp
index 603db80..58deecf 100644
--- a/test/1909-per-agent-tls/Android.bp
+++ b/test/1909-per-agent-tls/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1909-per-agent-tls-expected"],
+    data: [":art-run-test-1909-per-agent-tls-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1909-per-agent-tls-expected",
-    out: ["art-run-test-1909-per-agent-tls-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1909-per-agent-tls-expected-stdout",
+    out: ["art-run-test-1909-per-agent-tls-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1909-per-agent-tls/expected-stdout.txt

diff --git a/test/1909-per-agent-tls/expected.txt b/test/1909-per-agent-tls/expected-stdout.txt
similarity index 100%
rename from test/1909-per-agent-tls/expected.txt
rename to test/1909-per-agent-tls/expected-stdout.txt

test/1910-transform-with-default/Android.bp

diff --git a/test/1910-transform-with-default/Android.bp b/test/1910-transform-with-default/Android.bp
index 9746611..fde60f6 100644
--- a/test/1910-transform-with-default/Android.bp
+++ b/test/1910-transform-with-default/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1910-transform-with-default-expected"],
+    data: [":art-run-test-1910-transform-with-default-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1910-transform-with-default-expected",
-    out: ["art-run-test-1910-transform-with-default-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1910-transform-with-default-expected-stdout",
+    out: ["art-run-test-1910-transform-with-default-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1910-transform-with-default/expected-stdout.txt

diff --git a/test/1910-transform-with-default/expected.txt b/test/1910-transform-with-default/expected-stdout.txt
similarity index 100%
rename from test/1910-transform-with-default/expected.txt
rename to test/1910-transform-with-default/expected-stdout.txt

test/1911-get-local-var-table/Android.bp

diff --git a/test/1911-get-local-var-table/Android.bp b/test/1911-get-local-var-table/Android.bp
index 7694b28..bec6853 100644
--- a/test/1911-get-local-var-table/Android.bp
+++ b/test/1911-get-local-var-table/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1911-get-local-var-table-expected"],
+    data: [":art-run-test-1911-get-local-var-table-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1911-get-local-var-table-expected",
-    out: ["art-run-test-1911-get-local-var-table-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1911-get-local-var-table-expected-stdout",
+    out: ["art-run-test-1911-get-local-var-table-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1911-get-local-var-table/expected-stdout.txt

diff --git a/test/1911-get-local-var-table/expected.txt b/test/1911-get-local-var-table/expected-stdout.txt
similarity index 100%
rename from test/1911-get-local-var-table/expected.txt
rename to test/1911-get-local-var-table/expected-stdout.txt

test/1912-get-set-local-primitive/Android.bp

diff --git a/test/1912-get-set-local-primitive/Android.bp b/test/1912-get-set-local-primitive/Android.bp
index 7155d43..eaa8b01 100644
--- a/test/1912-get-set-local-primitive/Android.bp
+++ b/test/1912-get-set-local-primitive/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1912-get-set-local-primitive-expected"],
+    data: [":art-run-test-1912-get-set-local-primitive-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1912-get-set-local-primitive-expected",
-    out: ["art-run-test-1912-get-set-local-primitive-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1912-get-set-local-primitive-expected-stdout",
+    out: ["art-run-test-1912-get-set-local-primitive-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1912-get-set-local-primitive/expected-stdout.txt

diff --git a/test/1912-get-set-local-primitive/expected.txt b/test/1912-get-set-local-primitive/expected-stdout.txt
similarity index 100%
rename from test/1912-get-set-local-primitive/expected.txt
rename to test/1912-get-set-local-primitive/expected-stdout.txt

test/1913-get-set-local-objects/Android.bp

diff --git a/test/1913-get-set-local-objects/Android.bp b/test/1913-get-set-local-objects/Android.bp
index 7df00e2..d58183c 100644
--- a/test/1913-get-set-local-objects/Android.bp
+++ b/test/1913-get-set-local-objects/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1913-get-set-local-objects-expected"],
+    data: [":art-run-test-1913-get-set-local-objects-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1913-get-set-local-objects-expected",
-    out: ["art-run-test-1913-get-set-local-objects-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1913-get-set-local-objects-expected-stdout",
+    out: ["art-run-test-1913-get-set-local-objects-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1913-get-set-local-objects/expected-stdout.txt

diff --git a/test/1913-get-set-local-objects/expected.txt b/test/1913-get-set-local-objects/expected-stdout.txt
similarity index 100%
rename from test/1913-get-set-local-objects/expected.txt
rename to test/1913-get-set-local-objects/expected-stdout.txt

test/1914-get-local-instance/Android.bp

diff --git a/test/1914-get-local-instance/Android.bp b/test/1914-get-local-instance/Android.bp
index 361dac5..68006e3 100644
--- a/test/1914-get-local-instance/Android.bp
+++ b/test/1914-get-local-instance/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1914-get-local-instance-expected"],
+    data: [":art-run-test-1914-get-local-instance-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1914-get-local-instance-expected",
-    out: ["art-run-test-1914-get-local-instance-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1914-get-local-instance-expected-stdout",
+    out: ["art-run-test-1914-get-local-instance-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1914-get-local-instance/expected-stdout.txt

diff --git a/test/1914-get-local-instance/expected.txt b/test/1914-get-local-instance/expected-stdout.txt
similarity index 100%
rename from test/1914-get-local-instance/expected.txt
rename to test/1914-get-local-instance/expected-stdout.txt

test/1915-get-set-local-current-thread/Android.bp

diff --git a/test/1915-get-set-local-current-thread/Android.bp b/test/1915-get-set-local-current-thread/Android.bp
index c93992c..d756070 100644
--- a/test/1915-get-set-local-current-thread/Android.bp
+++ b/test/1915-get-set-local-current-thread/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1915-get-set-local-current-thread-expected"],
+    data: [":art-run-test-1915-get-set-local-current-thread-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1915-get-set-local-current-thread-expected",
-    out: ["art-run-test-1915-get-set-local-current-thread-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1915-get-set-local-current-thread-expected-stdout",
+    out: ["art-run-test-1915-get-set-local-current-thread-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1915-get-set-local-current-thread/expected-stdout.txt

diff --git a/test/1915-get-set-local-current-thread/expected.txt b/test/1915-get-set-local-current-thread/expected-stdout.txt
similarity index 100%
rename from test/1915-get-set-local-current-thread/expected.txt
rename to test/1915-get-set-local-current-thread/expected-stdout.txt

test/1916-get-set-current-frame/Android.bp

diff --git a/test/1916-get-set-current-frame/Android.bp b/test/1916-get-set-current-frame/Android.bp
index 8536bcd..151378d 100644
--- a/test/1916-get-set-current-frame/Android.bp
+++ b/test/1916-get-set-current-frame/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1916-get-set-current-frame-expected"],
+    data: [":art-run-test-1916-get-set-current-frame-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1916-get-set-current-frame-expected",
-    out: ["art-run-test-1916-get-set-current-frame-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1916-get-set-current-frame-expected-stdout",
+    out: ["art-run-test-1916-get-set-current-frame-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1916-get-set-current-frame/expected-stdout.txt

diff --git a/test/1916-get-set-current-frame/expected.txt b/test/1916-get-set-current-frame/expected-stdout.txt
similarity index 100%
rename from test/1916-get-set-current-frame/expected.txt
rename to test/1916-get-set-current-frame/expected-stdout.txt

test/1917-get-stack-frame/Android.bp

diff --git a/test/1917-get-stack-frame/Android.bp b/test/1917-get-stack-frame/Android.bp
index cecfff5..27a55ed 100644
--- a/test/1917-get-stack-frame/Android.bp
+++ b/test/1917-get-stack-frame/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1917-get-stack-frame-expected"],
+    data: [":art-run-test-1917-get-stack-frame-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1917-get-stack-frame-expected",
-    out: ["art-run-test-1917-get-stack-frame-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1917-get-stack-frame-expected-stdout",
+    out: ["art-run-test-1917-get-stack-frame-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1917-get-stack-frame/expected-stdout.txt

diff --git a/test/1917-get-stack-frame/expected.txt b/test/1917-get-stack-frame/expected-stdout.txt
similarity index 100%
rename from test/1917-get-stack-frame/expected.txt
rename to test/1917-get-stack-frame/expected-stdout.txt

test/1919-vminit-thread-start-timing/Android.bp

diff --git a/test/1919-vminit-thread-start-timing/Android.bp b/test/1919-vminit-thread-start-timing/Android.bp
index 93f7c3c..50f7809 100644
--- a/test/1919-vminit-thread-start-timing/Android.bp
+++ b/test/1919-vminit-thread-start-timing/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1919-vminit-thread-start-timing-expected"],
+    data: [":art-run-test-1919-vminit-thread-start-timing-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1919-vminit-thread-start-timing-expected",
-    out: ["art-run-test-1919-vminit-thread-start-timing-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1919-vminit-thread-start-timing-expected-stdout",
+    out: ["art-run-test-1919-vminit-thread-start-timing-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1919-vminit-thread-start-timing/expected-stdout.txt

diff --git a/test/1919-vminit-thread-start-timing/expected.txt b/test/1919-vminit-thread-start-timing/expected-stdout.txt
similarity index 100%
rename from test/1919-vminit-thread-start-timing/expected.txt
rename to test/1919-vminit-thread-start-timing/expected-stdout.txt

test/1920-suspend-native-monitor/Android.bp

diff --git a/test/1920-suspend-native-monitor/Android.bp b/test/1920-suspend-native-monitor/Android.bp
index 843124b..1074e68 100644
--- a/test/1920-suspend-native-monitor/Android.bp
+++ b/test/1920-suspend-native-monitor/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1920-suspend-native-monitor-expected"],
+    data: [":art-run-test-1920-suspend-native-monitor-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1920-suspend-native-monitor-expected",
-    out: ["art-run-test-1920-suspend-native-monitor-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1920-suspend-native-monitor-expected-stdout",
+    out: ["art-run-test-1920-suspend-native-monitor-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1920-suspend-native-monitor/expected-stdout.txt

diff --git a/test/1920-suspend-native-monitor/expected.txt b/test/1920-suspend-native-monitor/expected-stdout.txt
similarity index 100%
rename from test/1920-suspend-native-monitor/expected.txt
rename to test/1920-suspend-native-monitor/expected-stdout.txt

test/1921-suspend-native-recursive-monitor/Android.bp

diff --git a/test/1921-suspend-native-recursive-monitor/Android.bp b/test/1921-suspend-native-recursive-monitor/Android.bp
index b31085f..c143400 100644
--- a/test/1921-suspend-native-recursive-monitor/Android.bp
+++ b/test/1921-suspend-native-recursive-monitor/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1921-suspend-native-recursive-monitor-expected"],
+    data: [":art-run-test-1921-suspend-native-recursive-monitor-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1921-suspend-native-recursive-monitor-expected",
-    out: ["art-run-test-1921-suspend-native-recursive-monitor-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1921-suspend-native-recursive-monitor-expected-stdout",
+    out: ["art-run-test-1921-suspend-native-recursive-monitor-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1921-suspend-native-recursive-monitor/expected-stdout.txt

diff --git a/test/1921-suspend-native-recursive-monitor/expected.txt b/test/1921-suspend-native-recursive-monitor/expected-stdout.txt
similarity index 100%
rename from test/1921-suspend-native-recursive-monitor/expected.txt
rename to test/1921-suspend-native-recursive-monitor/expected-stdout.txt

test/1922-owned-monitors-info/Android.bp

diff --git a/test/1922-owned-monitors-info/Android.bp b/test/1922-owned-monitors-info/Android.bp
index f0b9b84..6f0600d 100644
--- a/test/1922-owned-monitors-info/Android.bp
+++ b/test/1922-owned-monitors-info/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1922-owned-monitors-info-expected"],
+    data: [":art-run-test-1922-owned-monitors-info-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1922-owned-monitors-info-expected",
-    out: ["art-run-test-1922-owned-monitors-info-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1922-owned-monitors-info-expected-stdout",
+    out: ["art-run-test-1922-owned-monitors-info-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1922-owned-monitors-info/expected-stdout.txt

diff --git a/test/1922-owned-monitors-info/expected.txt b/test/1922-owned-monitors-info/expected-stdout.txt
similarity index 100%
rename from test/1922-owned-monitors-info/expected.txt
rename to test/1922-owned-monitors-info/expected-stdout.txt

test/1923-frame-pop/Android.bp

diff --git a/test/1923-frame-pop/Android.bp b/test/1923-frame-pop/Android.bp
index 560eb1f..47dde46 100644
--- a/test/1923-frame-pop/Android.bp
+++ b/test/1923-frame-pop/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1923-frame-pop-expected"],
+    data: [":art-run-test-1923-frame-pop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1923-frame-pop-expected",
-    out: ["art-run-test-1923-frame-pop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1923-frame-pop-expected-stdout",
+    out: ["art-run-test-1923-frame-pop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1923-frame-pop/expected-stdout.txt

diff --git a/test/1923-frame-pop/expected.txt b/test/1923-frame-pop/expected-stdout.txt
similarity index 100%
rename from test/1923-frame-pop/expected.txt
rename to test/1923-frame-pop/expected-stdout.txt

test/1924-frame-pop-toggle/Android.bp

diff --git a/test/1924-frame-pop-toggle/Android.bp b/test/1924-frame-pop-toggle/Android.bp
index 3e43f06..95dd0e4 100644
--- a/test/1924-frame-pop-toggle/Android.bp
+++ b/test/1924-frame-pop-toggle/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1924-frame-pop-toggle-expected"],
+    data: [":art-run-test-1924-frame-pop-toggle-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1924-frame-pop-toggle-expected",
-    out: ["art-run-test-1924-frame-pop-toggle-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1924-frame-pop-toggle-expected-stdout",
+    out: ["art-run-test-1924-frame-pop-toggle-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1924-frame-pop-toggle/expected-stdout.txt

diff --git a/test/1924-frame-pop-toggle/expected.txt b/test/1924-frame-pop-toggle/expected-stdout.txt
similarity index 100%
rename from test/1924-frame-pop-toggle/expected.txt
rename to test/1924-frame-pop-toggle/expected-stdout.txt

test/1925-self-frame-pop/Android.bp

diff --git a/test/1925-self-frame-pop/Android.bp b/test/1925-self-frame-pop/Android.bp
index 0bcdcf4..9fdc253 100644
--- a/test/1925-self-frame-pop/Android.bp
+++ b/test/1925-self-frame-pop/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1925-self-frame-pop-expected"],
+    data: [":art-run-test-1925-self-frame-pop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1925-self-frame-pop-expected",
-    out: ["art-run-test-1925-self-frame-pop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1925-self-frame-pop-expected-stdout",
+    out: ["art-run-test-1925-self-frame-pop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1925-self-frame-pop/expected-stdout.txt

diff --git a/test/1925-self-frame-pop/expected.txt b/test/1925-self-frame-pop/expected-stdout.txt
similarity index 100%
rename from test/1925-self-frame-pop/expected.txt
rename to test/1925-self-frame-pop/expected-stdout.txt

test/1926-missed-frame-pop/Android.bp

diff --git a/test/1926-missed-frame-pop/Android.bp b/test/1926-missed-frame-pop/Android.bp
index 720c9ef..e3c7709 100644
--- a/test/1926-missed-frame-pop/Android.bp
+++ b/test/1926-missed-frame-pop/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1926-missed-frame-pop-expected"],
+    data: [":art-run-test-1926-missed-frame-pop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1926-missed-frame-pop-expected",
-    out: ["art-run-test-1926-missed-frame-pop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1926-missed-frame-pop-expected-stdout",
+    out: ["art-run-test-1926-missed-frame-pop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1926-missed-frame-pop/expected-stdout.txt

diff --git a/test/1926-missed-frame-pop/expected.txt b/test/1926-missed-frame-pop/expected-stdout.txt
similarity index 100%
rename from test/1926-missed-frame-pop/expected.txt
rename to test/1926-missed-frame-pop/expected-stdout.txt

test/1927-exception-event/Android.bp

diff --git a/test/1927-exception-event/Android.bp b/test/1927-exception-event/Android.bp
index 4fe46ff..493980c 100644
--- a/test/1927-exception-event/Android.bp
+++ b/test/1927-exception-event/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1927-exception-event-expected"],
+    data: [":art-run-test-1927-exception-event-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1927-exception-event-expected",
-    out: ["art-run-test-1927-exception-event-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1927-exception-event-expected-stdout",
+    out: ["art-run-test-1927-exception-event-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1927-exception-event/expected-stdout.txt

diff --git a/test/1927-exception-event/expected.txt b/test/1927-exception-event/expected-stdout.txt
similarity index 100%
rename from test/1927-exception-event/expected.txt
rename to test/1927-exception-event/expected-stdout.txt

test/1928-exception-event-exception/Android.bp

diff --git a/test/1928-exception-event-exception/Android.bp b/test/1928-exception-event-exception/Android.bp
index 88224b1..776699b 100644
--- a/test/1928-exception-event-exception/Android.bp
+++ b/test/1928-exception-event-exception/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1928-exception-event-exception-expected"],
+    data: [":art-run-test-1928-exception-event-exception-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1928-exception-event-exception-expected",
-    out: ["art-run-test-1928-exception-event-exception-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1928-exception-event-exception-expected-stdout",
+    out: ["art-run-test-1928-exception-event-exception-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1928-exception-event-exception/expected-stdout.txt

diff --git a/test/1928-exception-event-exception/expected.txt b/test/1928-exception-event-exception/expected-stdout.txt
similarity index 100%
rename from test/1928-exception-event-exception/expected.txt
rename to test/1928-exception-event-exception/expected-stdout.txt

test/1929-exception-catch-exception/expected-stdout.txt

diff --git a/test/1929-exception-catch-exception/expected.txt b/test/1929-exception-catch-exception/expected-stdout.txt
similarity index 100%
rename from test/1929-exception-catch-exception/expected.txt
rename to test/1929-exception-catch-exception/expected-stdout.txt

test/1930-monitor-info/Android.bp

diff --git a/test/1930-monitor-info/Android.bp b/test/1930-monitor-info/Android.bp
index 32d5da3..4fd007f 100644
--- a/test/1930-monitor-info/Android.bp
+++ b/test/1930-monitor-info/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1930-monitor-info-expected"],
+    data: [":art-run-test-1930-monitor-info-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1930-monitor-info-expected",
-    out: ["art-run-test-1930-monitor-info-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1930-monitor-info-expected-stdout",
+    out: ["art-run-test-1930-monitor-info-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1930-monitor-info/expected-stdout.txt

diff --git a/test/1930-monitor-info/expected.txt b/test/1930-monitor-info/expected-stdout.txt
similarity index 100%
rename from test/1930-monitor-info/expected.txt
rename to test/1930-monitor-info/expected-stdout.txt

test/1931-monitor-events/Android.bp

diff --git a/test/1931-monitor-events/Android.bp b/test/1931-monitor-events/Android.bp
index 692a185..b47c6e5 100644
--- a/test/1931-monitor-events/Android.bp
+++ b/test/1931-monitor-events/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1931-monitor-events-expected"],
+    data: [":art-run-test-1931-monitor-events-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1931-monitor-events-expected",
-    out: ["art-run-test-1931-monitor-events-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1931-monitor-events-expected-stdout",
+    out: ["art-run-test-1931-monitor-events-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1931-monitor-events/check

diff --git a/test/1931-monitor-events/check b/test/1931-monitor-events/check
index 8a7f844..53d6a4a 100644
--- a/test/1931-monitor-events/check
+++ b/test/1931-monitor-events/check
@@ -16,7 +16,7 @@
 
 # Art sends events for park/unpark, and the RI doesn't. Remove it from the expected output.
 if [[ "$TEST_RUNTIME" == "jvm" ]]; then
-  patch -p0 expected.txt < jvm-expected.patch >/dev/null
+  patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null
 fi
 
 ./default-check "$@"

test/1931-monitor-events/expected-stdout.txt

diff --git a/test/1931-monitor-events/expected.txt b/test/1931-monitor-events/expected-stdout.txt
similarity index 100%
rename from test/1931-monitor-events/expected.txt
rename to test/1931-monitor-events/expected-stdout.txt

test/1932-monitor-events-misc/Android.bp

diff --git a/test/1932-monitor-events-misc/Android.bp b/test/1932-monitor-events-misc/Android.bp
index 940e92a..a081663 100644
--- a/test/1932-monitor-events-misc/Android.bp
+++ b/test/1932-monitor-events-misc/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1932-monitor-events-misc-expected"],
+    data: [":art-run-test-1932-monitor-events-misc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1932-monitor-events-misc-expected",
-    out: ["art-run-test-1932-monitor-events-misc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1932-monitor-events-misc-expected-stdout",
+    out: ["art-run-test-1932-monitor-events-misc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1932-monitor-events-misc/check

diff --git a/test/1932-monitor-events-misc/check b/test/1932-monitor-events-misc/check
index 8a84388..05cbb5f 100644
--- a/test/1932-monitor-events-misc/check
+++ b/test/1932-monitor-events-misc/check
@@ -16,7 +16,7 @@
 
 # The RI sends an extra event that art doesn't. Add it to the expected output.
 if [[ "$TEST_RUNTIME" == "jvm" ]]; then
-  patch -p0 expected.txt < jvm-expected.patch >/dev/null
+  patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null
 fi
 
 ./default-check "$@"

test/1932-monitor-events-misc/expected-stdout.txt

diff --git a/test/1932-monitor-events-misc/expected.txt b/test/1932-monitor-events-misc/expected-stdout.txt
similarity index 100%
rename from test/1932-monitor-events-misc/expected.txt
rename to test/1932-monitor-events-misc/expected-stdout.txt

test/1933-monitor-current-contended/Android.bp

diff --git a/test/1933-monitor-current-contended/Android.bp b/test/1933-monitor-current-contended/Android.bp
index 19d881a..7e7e812 100644
--- a/test/1933-monitor-current-contended/Android.bp
+++ b/test/1933-monitor-current-contended/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1933-monitor-current-contended-expected"],
+    data: [":art-run-test-1933-monitor-current-contended-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1933-monitor-current-contended-expected",
-    out: ["art-run-test-1933-monitor-current-contended-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1933-monitor-current-contended-expected-stdout",
+    out: ["art-run-test-1933-monitor-current-contended-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1933-monitor-current-contended/expected-stdout.txt

diff --git a/test/1933-monitor-current-contended/expected.txt b/test/1933-monitor-current-contended/expected-stdout.txt
similarity index 100%
rename from test/1933-monitor-current-contended/expected.txt
rename to test/1933-monitor-current-contended/expected-stdout.txt

test/1934-jvmti-signal-thread/Android.bp

diff --git a/test/1934-jvmti-signal-thread/Android.bp b/test/1934-jvmti-signal-thread/Android.bp
index c1a73ea..74cfd88 100644
--- a/test/1934-jvmti-signal-thread/Android.bp
+++ b/test/1934-jvmti-signal-thread/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1934-jvmti-signal-thread-expected"],
+    data: [":art-run-test-1934-jvmti-signal-thread-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1934-jvmti-signal-thread-expected",
-    out: ["art-run-test-1934-jvmti-signal-thread-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1934-jvmti-signal-thread-expected-stdout",
+    out: ["art-run-test-1934-jvmti-signal-thread-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1934-jvmti-signal-thread/expected-stdout.txt

diff --git a/test/1934-jvmti-signal-thread/expected.txt b/test/1934-jvmti-signal-thread/expected-stdout.txt
similarity index 100%
rename from test/1934-jvmti-signal-thread/expected.txt
rename to test/1934-jvmti-signal-thread/expected-stdout.txt

test/1935-get-set-current-frame-jit/Android.bp

diff --git a/test/1935-get-set-current-frame-jit/Android.bp b/test/1935-get-set-current-frame-jit/Android.bp
index 0f51baa..684ed9b 100644
--- a/test/1935-get-set-current-frame-jit/Android.bp
+++ b/test/1935-get-set-current-frame-jit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1935-get-set-current-frame-jit-expected"],
+    data: [":art-run-test-1935-get-set-current-frame-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1935-get-set-current-frame-jit-expected",
-    out: ["art-run-test-1935-get-set-current-frame-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1935-get-set-current-frame-jit-expected-stdout",
+    out: ["art-run-test-1935-get-set-current-frame-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1935-get-set-current-frame-jit/expected-stdout.txt

diff --git a/test/1935-get-set-current-frame-jit/expected.txt b/test/1935-get-set-current-frame-jit/expected-stdout.txt
similarity index 100%
rename from test/1935-get-set-current-frame-jit/expected.txt
rename to test/1935-get-set-current-frame-jit/expected-stdout.txt

test/1936-thread-end-events/Android.bp

diff --git a/test/1936-thread-end-events/Android.bp b/test/1936-thread-end-events/Android.bp
index 53fd795..fe13d51 100644
--- a/test/1936-thread-end-events/Android.bp
+++ b/test/1936-thread-end-events/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1936-thread-end-events-expected"],
+    data: [":art-run-test-1936-thread-end-events-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1936-thread-end-events-expected",
-    out: ["art-run-test-1936-thread-end-events-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1936-thread-end-events-expected-stdout",
+    out: ["art-run-test-1936-thread-end-events-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1936-thread-end-events/check

diff --git a/test/1936-thread-end-events/check b/test/1936-thread-end-events/check
index 8a84388..05cbb5f 100644
--- a/test/1936-thread-end-events/check
+++ b/test/1936-thread-end-events/check
@@ -16,7 +16,7 @@
 
 # The RI sends an extra event that art doesn't. Add it to the expected output.
 if [[ "$TEST_RUNTIME" == "jvm" ]]; then
-  patch -p0 expected.txt < jvm-expected.patch >/dev/null
+  patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null
 fi
 
 ./default-check "$@"

test/1936-thread-end-events/expected-stdout.txt

diff --git a/test/1936-thread-end-events/expected.txt b/test/1936-thread-end-events/expected-stdout.txt
similarity index 100%
rename from test/1936-thread-end-events/expected.txt
rename to test/1936-thread-end-events/expected-stdout.txt

test/1937-transform-soft-fail/Android.bp

diff --git a/test/1937-transform-soft-fail/Android.bp b/test/1937-transform-soft-fail/Android.bp
index c9fb982..2ca7b27 100644
--- a/test/1937-transform-soft-fail/Android.bp
+++ b/test/1937-transform-soft-fail/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1937-transform-soft-fail-expected"],
+    data: [":art-run-test-1937-transform-soft-fail-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1937-transform-soft-fail-expected",
-    out: ["art-run-test-1937-transform-soft-fail-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1937-transform-soft-fail-expected-stdout",
+    out: ["art-run-test-1937-transform-soft-fail-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1937-transform-soft-fail/expected-stdout.txt

diff --git a/test/1937-transform-soft-fail/expected.txt b/test/1937-transform-soft-fail/expected-stdout.txt
similarity index 100%
rename from test/1937-transform-soft-fail/expected.txt
rename to test/1937-transform-soft-fail/expected-stdout.txt

test/1938-transform-abstract-single-impl/Android.bp

diff --git a/test/1938-transform-abstract-single-impl/Android.bp b/test/1938-transform-abstract-single-impl/Android.bp
index 0802186..d1312ef 100644
--- a/test/1938-transform-abstract-single-impl/Android.bp
+++ b/test/1938-transform-abstract-single-impl/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1938-transform-abstract-single-impl-expected"],
+    data: [":art-run-test-1938-transform-abstract-single-impl-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1938-transform-abstract-single-impl-expected",
-    out: ["art-run-test-1938-transform-abstract-single-impl-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1938-transform-abstract-single-impl-expected-stdout",
+    out: ["art-run-test-1938-transform-abstract-single-impl-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1938-transform-abstract-single-impl/expected-stdout.txt

diff --git a/test/1938-transform-abstract-single-impl/expected.txt b/test/1938-transform-abstract-single-impl/expected-stdout.txt
similarity index 100%
rename from test/1938-transform-abstract-single-impl/expected.txt
rename to test/1938-transform-abstract-single-impl/expected-stdout.txt

test/1939-proxy-frames/Android.bp

diff --git a/test/1939-proxy-frames/Android.bp b/test/1939-proxy-frames/Android.bp
index ff3d5cd..40c224e 100644
--- a/test/1939-proxy-frames/Android.bp
+++ b/test/1939-proxy-frames/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1939-proxy-frames-expected"],
+    data: [":art-run-test-1939-proxy-frames-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1939-proxy-frames-expected",
-    out: ["art-run-test-1939-proxy-frames-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1939-proxy-frames-expected-stdout",
+    out: ["art-run-test-1939-proxy-frames-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1939-proxy-frames/expected-stdout.txt

diff --git a/test/1939-proxy-frames/expected.txt b/test/1939-proxy-frames/expected-stdout.txt
similarity index 100%
rename from test/1939-proxy-frames/expected.txt
rename to test/1939-proxy-frames/expected-stdout.txt

test/1940-ddms-ext/expected-stdout.txt

diff --git a/test/1940-ddms-ext/expected.txt b/test/1940-ddms-ext/expected-stdout.txt
similarity index 100%
rename from test/1940-ddms-ext/expected.txt
rename to test/1940-ddms-ext/expected-stdout.txt

test/1941-dispose-stress/Android.bp

diff --git a/test/1941-dispose-stress/Android.bp b/test/1941-dispose-stress/Android.bp
index ac6fb5c..6bb5c36 100644
--- a/test/1941-dispose-stress/Android.bp
+++ b/test/1941-dispose-stress/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1941-dispose-stress-expected"],
+    data: [":art-run-test-1941-dispose-stress-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1941-dispose-stress-expected",
-    out: ["art-run-test-1941-dispose-stress-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1941-dispose-stress-expected-stdout",
+    out: ["art-run-test-1941-dispose-stress-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1941-dispose-stress/expected-stdout.txt

diff --git a/test/1941-dispose-stress/expected.txt b/test/1941-dispose-stress/expected-stdout.txt
similarity index 100%
rename from test/1941-dispose-stress/expected.txt
rename to test/1941-dispose-stress/expected-stdout.txt

test/1942-suspend-raw-monitor-exit/Android.bp

diff --git a/test/1942-suspend-raw-monitor-exit/Android.bp b/test/1942-suspend-raw-monitor-exit/Android.bp
index cf1886f..b2b8070 100644
--- a/test/1942-suspend-raw-monitor-exit/Android.bp
+++ b/test/1942-suspend-raw-monitor-exit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1942-suspend-raw-monitor-exit-expected"],
+    data: [":art-run-test-1942-suspend-raw-monitor-exit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1942-suspend-raw-monitor-exit-expected",
-    out: ["art-run-test-1942-suspend-raw-monitor-exit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1942-suspend-raw-monitor-exit-expected-stdout",
+    out: ["art-run-test-1942-suspend-raw-monitor-exit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1942-suspend-raw-monitor-exit/expected-stdout.txt

diff --git a/test/1942-suspend-raw-monitor-exit/expected.txt b/test/1942-suspend-raw-monitor-exit/expected-stdout.txt
similarity index 100%
rename from test/1942-suspend-raw-monitor-exit/expected.txt
rename to test/1942-suspend-raw-monitor-exit/expected-stdout.txt

test/1943-suspend-raw-monitor-wait/Android.bp

diff --git a/test/1943-suspend-raw-monitor-wait/Android.bp b/test/1943-suspend-raw-monitor-wait/Android.bp
index 1aa2636..902cb48 100644
--- a/test/1943-suspend-raw-monitor-wait/Android.bp
+++ b/test/1943-suspend-raw-monitor-wait/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1943-suspend-raw-monitor-wait-expected"],
+    data: [":art-run-test-1943-suspend-raw-monitor-wait-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1943-suspend-raw-monitor-wait-expected",
-    out: ["art-run-test-1943-suspend-raw-monitor-wait-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1943-suspend-raw-monitor-wait-expected-stdout",
+    out: ["art-run-test-1943-suspend-raw-monitor-wait-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1943-suspend-raw-monitor-wait/expected-stdout.txt

diff --git a/test/1943-suspend-raw-monitor-wait/expected.txt b/test/1943-suspend-raw-monitor-wait/expected-stdout.txt
similarity index 100%
rename from test/1943-suspend-raw-monitor-wait/expected.txt
rename to test/1943-suspend-raw-monitor-wait/expected-stdout.txt

test/1945-proxy-method-arguments/Android.bp

diff --git a/test/1945-proxy-method-arguments/Android.bp b/test/1945-proxy-method-arguments/Android.bp
index b5db6d7..7236fd1 100644
--- a/test/1945-proxy-method-arguments/Android.bp
+++ b/test/1945-proxy-method-arguments/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1945-proxy-method-arguments-expected"],
+    data: [":art-run-test-1945-proxy-method-arguments-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1945-proxy-method-arguments-expected",
-    out: ["art-run-test-1945-proxy-method-arguments-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1945-proxy-method-arguments-expected-stdout",
+    out: ["art-run-test-1945-proxy-method-arguments-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1945-proxy-method-arguments/expected-stdout.txt

diff --git a/test/1945-proxy-method-arguments/expected.txt b/test/1945-proxy-method-arguments/expected-stdout.txt
similarity index 100%
rename from test/1945-proxy-method-arguments/expected.txt
rename to test/1945-proxy-method-arguments/expected-stdout.txt

test/1946-list-descriptors/expected-stdout.txt

diff --git a/test/1946-list-descriptors/expected.txt b/test/1946-list-descriptors/expected-stdout.txt
similarity index 100%
rename from test/1946-list-descriptors/expected.txt
rename to test/1946-list-descriptors/expected-stdout.txt

test/1947-breakpoint-redefine-deopt/Android.bp

diff --git a/test/1947-breakpoint-redefine-deopt/Android.bp b/test/1947-breakpoint-redefine-deopt/Android.bp
index ce1eff9..9aaa7df 100644
--- a/test/1947-breakpoint-redefine-deopt/Android.bp
+++ b/test/1947-breakpoint-redefine-deopt/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1947-breakpoint-redefine-deopt-expected"],
+    data: [":art-run-test-1947-breakpoint-redefine-deopt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1947-breakpoint-redefine-deopt-expected",
-    out: ["art-run-test-1947-breakpoint-redefine-deopt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1947-breakpoint-redefine-deopt-expected-stdout",
+    out: ["art-run-test-1947-breakpoint-redefine-deopt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1947-breakpoint-redefine-deopt/expected-stdout.txt

diff --git a/test/1947-breakpoint-redefine-deopt/expected.txt b/test/1947-breakpoint-redefine-deopt/expected-stdout.txt
similarity index 100%
rename from test/1947-breakpoint-redefine-deopt/expected.txt
rename to test/1947-breakpoint-redefine-deopt/expected-stdout.txt

test/1948-obsolete-const-method-handle/expected-stdout.txt

diff --git a/test/1948-obsolete-const-method-handle/expected.txt b/test/1948-obsolete-const-method-handle/expected-stdout.txt
similarity index 100%
rename from test/1948-obsolete-const-method-handle/expected.txt
rename to test/1948-obsolete-const-method-handle/expected-stdout.txt

test/1949-short-dex-file/Android.bp

diff --git a/test/1949-short-dex-file/Android.bp b/test/1949-short-dex-file/Android.bp
index ca92e73..8e6c72d 100644
--- a/test/1949-short-dex-file/Android.bp
+++ b/test/1949-short-dex-file/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1949-short-dex-file-expected"],
+    data: [":art-run-test-1949-short-dex-file-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1949-short-dex-file-expected",
-    out: ["art-run-test-1949-short-dex-file-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1949-short-dex-file-expected-stdout",
+    out: ["art-run-test-1949-short-dex-file-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1949-short-dex-file/expected-stdout.txt

diff --git a/test/1949-short-dex-file/expected.txt b/test/1949-short-dex-file/expected-stdout.txt
similarity index 100%
rename from test/1949-short-dex-file/expected.txt
rename to test/1949-short-dex-file/expected-stdout.txt

test/1950-unprepared-transform/check

diff --git a/test/1950-unprepared-transform/check b/test/1950-unprepared-transform/check
index 8a84388..05cbb5f 100755
--- a/test/1950-unprepared-transform/check
+++ b/test/1950-unprepared-transform/check
@@ -16,7 +16,7 @@
 
 # The RI sends an extra event that art doesn't. Add it to the expected output.
 if [[ "$TEST_RUNTIME" == "jvm" ]]; then
-  patch -p0 expected.txt < jvm-expected.patch >/dev/null
+  patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null
 fi
 
 ./default-check "$@"

test/1950-unprepared-transform/expected-stdout.txt

diff --git a/test/1950-unprepared-transform/expected.txt b/test/1950-unprepared-transform/expected-stdout.txt
similarity index 100%
rename from test/1950-unprepared-transform/expected.txt
rename to test/1950-unprepared-transform/expected-stdout.txt

test/1951-monitor-enter-no-suspend/Android.bp

diff --git a/test/1951-monitor-enter-no-suspend/Android.bp b/test/1951-monitor-enter-no-suspend/Android.bp
index a4b699c..00d271c 100644
--- a/test/1951-monitor-enter-no-suspend/Android.bp
+++ b/test/1951-monitor-enter-no-suspend/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1951-monitor-enter-no-suspend-expected"],
+    data: [":art-run-test-1951-monitor-enter-no-suspend-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1951-monitor-enter-no-suspend-expected",
-    out: ["art-run-test-1951-monitor-enter-no-suspend-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1951-monitor-enter-no-suspend-expected-stdout",
+    out: ["art-run-test-1951-monitor-enter-no-suspend-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1951-monitor-enter-no-suspend/expected-stdout.txt

diff --git a/test/1951-monitor-enter-no-suspend/expected.txt b/test/1951-monitor-enter-no-suspend/expected-stdout.txt
similarity index 100%
rename from test/1951-monitor-enter-no-suspend/expected.txt
rename to test/1951-monitor-enter-no-suspend/expected-stdout.txt

test/1953-pop-frame/Android.bp

diff --git a/test/1953-pop-frame/Android.bp b/test/1953-pop-frame/Android.bp
index 0110ff8..25b74e8 100644
--- a/test/1953-pop-frame/Android.bp
+++ b/test/1953-pop-frame/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1953-pop-frame-expected"],
+    data: [":art-run-test-1953-pop-frame-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1953-pop-frame-expected",
-    out: ["art-run-test-1953-pop-frame-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1953-pop-frame-expected-stdout",
+    out: ["art-run-test-1953-pop-frame-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1953-pop-frame/check

diff --git a/test/1953-pop-frame/check b/test/1953-pop-frame/check
index d552272..43a9218 100755
--- a/test/1953-pop-frame/check
+++ b/test/1953-pop-frame/check
@@ -18,4 +18,4 @@
 # See b/116003018. Some configurations cannot handle the class load events in
 # quite the right way so they are disabled there too.
 ./default-check "$@" || \
-  (patch -p0 expected.txt < class-loading-expected.patch >/dev/null && ./default-check "$@")
+  (patch -p0 expected-stdout.txt < class-loading-expected.patch >/dev/null && ./default-check "$@")

test/1953-pop-frame/expected-stdout.txt

diff --git a/test/1953-pop-frame/expected.txt b/test/1953-pop-frame/expected-stdout.txt
similarity index 100%
rename from test/1953-pop-frame/expected.txt
rename to test/1953-pop-frame/expected-stdout.txt

test/1954-pop-frame-jit/Android.bp

diff --git a/test/1954-pop-frame-jit/Android.bp b/test/1954-pop-frame-jit/Android.bp
index 06e2505..6c695a6 100644
--- a/test/1954-pop-frame-jit/Android.bp
+++ b/test/1954-pop-frame-jit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1954-pop-frame-jit-expected"],
+    data: [":art-run-test-1954-pop-frame-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1954-pop-frame-jit-expected",
-    out: ["art-run-test-1954-pop-frame-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1954-pop-frame-jit-expected-stdout",
+    out: ["art-run-test-1954-pop-frame-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1954-pop-frame-jit/check

diff --git a/test/1954-pop-frame-jit/check b/test/1954-pop-frame-jit/check
index 10b87cc..c3678b7 100755
--- a/test/1954-pop-frame-jit/check
+++ b/test/1954-pop-frame-jit/check
@@ -18,4 +18,4 @@
 # See b/116003018. Some configurations cannot handle the class load events in
 # quite the right way so they are disabled there too.
 ./default-check "$@" || \
-  (patch -p0 expected.txt < jvm-expected.patch >/dev/null && ./default-check "$@")
+  (patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null && ./default-check "$@")

test/1954-pop-frame-jit/expected-stdout.txt

diff --git a/test/1954-pop-frame-jit/expected.txt b/test/1954-pop-frame-jit/expected-stdout.txt
similarity index 100%
rename from test/1954-pop-frame-jit/expected.txt
rename to test/1954-pop-frame-jit/expected-stdout.txt

test/1955-pop-frame-jit-called/Android.bp

diff --git a/test/1955-pop-frame-jit-called/Android.bp b/test/1955-pop-frame-jit-called/Android.bp
index f862f69..cd2c03f 100644
--- a/test/1955-pop-frame-jit-called/Android.bp
+++ b/test/1955-pop-frame-jit-called/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1955-pop-frame-jit-called-expected"],
+    data: [":art-run-test-1955-pop-frame-jit-called-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1955-pop-frame-jit-called-expected",
-    out: ["art-run-test-1955-pop-frame-jit-called-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1955-pop-frame-jit-called-expected-stdout",
+    out: ["art-run-test-1955-pop-frame-jit-called-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1955-pop-frame-jit-called/check

diff --git a/test/1955-pop-frame-jit-called/check b/test/1955-pop-frame-jit-called/check
index 10b87cc..c3678b7 100755
--- a/test/1955-pop-frame-jit-called/check
+++ b/test/1955-pop-frame-jit-called/check
@@ -18,4 +18,4 @@
 # See b/116003018. Some configurations cannot handle the class load events in
 # quite the right way so they are disabled there too.
 ./default-check "$@" || \
-  (patch -p0 expected.txt < jvm-expected.patch >/dev/null && ./default-check "$@")
+  (patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null && ./default-check "$@")

test/1955-pop-frame-jit-called/expected-stdout.txt

diff --git a/test/1955-pop-frame-jit-called/expected.txt b/test/1955-pop-frame-jit-called/expected-stdout.txt
similarity index 100%
rename from test/1955-pop-frame-jit-called/expected.txt
rename to test/1955-pop-frame-jit-called/expected-stdout.txt

test/1956-pop-frame-jit-calling/Android.bp

diff --git a/test/1956-pop-frame-jit-calling/Android.bp b/test/1956-pop-frame-jit-calling/Android.bp
index 9a967fa..6ee4842 100644
--- a/test/1956-pop-frame-jit-calling/Android.bp
+++ b/test/1956-pop-frame-jit-calling/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1956-pop-frame-jit-calling-expected"],
+    data: [":art-run-test-1956-pop-frame-jit-calling-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1956-pop-frame-jit-calling-expected",
-    out: ["art-run-test-1956-pop-frame-jit-calling-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1956-pop-frame-jit-calling-expected-stdout",
+    out: ["art-run-test-1956-pop-frame-jit-calling-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1956-pop-frame-jit-calling/check

diff --git a/test/1956-pop-frame-jit-calling/check b/test/1956-pop-frame-jit-calling/check
index 10b87cc..c3678b7 100755
--- a/test/1956-pop-frame-jit-calling/check
+++ b/test/1956-pop-frame-jit-calling/check
@@ -18,4 +18,4 @@
 # See b/116003018. Some configurations cannot handle the class load events in
 # quite the right way so they are disabled there too.
 ./default-check "$@" || \
-  (patch -p0 expected.txt < jvm-expected.patch >/dev/null && ./default-check "$@")
+  (patch -p0 expected-stdout.txt < jvm-expected.patch >/dev/null && ./default-check "$@")

test/1956-pop-frame-jit-calling/expected-stdout.txt

diff --git a/test/1956-pop-frame-jit-calling/expected.txt b/test/1956-pop-frame-jit-calling/expected-stdout.txt
similarity index 100%
rename from test/1956-pop-frame-jit-calling/expected.txt
rename to test/1956-pop-frame-jit-calling/expected-stdout.txt

test/1957-error-ext/Android.bp

diff --git a/test/1957-error-ext/Android.bp b/test/1957-error-ext/Android.bp
index 9b53948..6bf9f21 100644
--- a/test/1957-error-ext/Android.bp
+++ b/test/1957-error-ext/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1957-error-ext-expected"],
+    data: [":art-run-test-1957-error-ext-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1957-error-ext-expected",
-    out: ["art-run-test-1957-error-ext-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1957-error-ext-expected-stdout",
+    out: ["art-run-test-1957-error-ext-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1957-error-ext/expected-stdout.txt

diff --git a/test/1957-error-ext/expected.txt b/test/1957-error-ext/expected-stdout.txt
similarity index 100%
rename from test/1957-error-ext/expected.txt
rename to test/1957-error-ext/expected-stdout.txt

test/1958-transform-try-jit/Android.bp

diff --git a/test/1958-transform-try-jit/Android.bp b/test/1958-transform-try-jit/Android.bp
index 1653b94..61097f6 100644
--- a/test/1958-transform-try-jit/Android.bp
+++ b/test/1958-transform-try-jit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1958-transform-try-jit-expected"],
+    data: [":art-run-test-1958-transform-try-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1958-transform-try-jit-expected",
-    out: ["art-run-test-1958-transform-try-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1958-transform-try-jit-expected-stdout",
+    out: ["art-run-test-1958-transform-try-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1958-transform-try-jit/expected-stdout.txt

diff --git a/test/1958-transform-try-jit/expected.txt b/test/1958-transform-try-jit/expected-stdout.txt
similarity index 100%
rename from test/1958-transform-try-jit/expected.txt
rename to test/1958-transform-try-jit/expected-stdout.txt

test/1959-redefine-object-instrument/Android.bp

diff --git a/test/1959-redefine-object-instrument/Android.bp b/test/1959-redefine-object-instrument/Android.bp
index db9ab8c..ca8088d 100644
--- a/test/1959-redefine-object-instrument/Android.bp
+++ b/test/1959-redefine-object-instrument/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1959-redefine-object-instrument-expected"],
+    data: [":art-run-test-1959-redefine-object-instrument-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1959-redefine-object-instrument-expected",
-    out: ["art-run-test-1959-redefine-object-instrument-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1959-redefine-object-instrument-expected-stdout",
+    out: ["art-run-test-1959-redefine-object-instrument-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1959-redefine-object-instrument/expected-stdout.txt

diff --git a/test/1959-redefine-object-instrument/expected.txt b/test/1959-redefine-object-instrument/expected-stdout.txt
similarity index 100%
rename from test/1959-redefine-object-instrument/expected.txt
rename to test/1959-redefine-object-instrument/expected-stdout.txt

test/1960-checker-bounds-codegen/Android.bp

diff --git a/test/1960-checker-bounds-codegen/Android.bp b/test/1960-checker-bounds-codegen/Android.bp
index 6e104f4..a3d8079 100644
--- a/test/1960-checker-bounds-codegen/Android.bp
+++ b/test/1960-checker-bounds-codegen/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1960-checker-bounds-codegen-expected"],
+    data: [":art-run-test-1960-checker-bounds-codegen-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1960-checker-bounds-codegen-expected",
-    out: ["art-run-test-1960-checker-bounds-codegen-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1960-checker-bounds-codegen-expected-stdout",
+    out: ["art-run-test-1960-checker-bounds-codegen-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1960-checker-bounds-codegen/expected-stdout.txt

diff --git a/test/1960-checker-bounds-codegen/expected.txt b/test/1960-checker-bounds-codegen/expected-stdout.txt
similarity index 100%
rename from test/1960-checker-bounds-codegen/expected.txt
rename to test/1960-checker-bounds-codegen/expected-stdout.txt

test/1960-obsolete-jit-multithread-native/Android.bp

diff --git a/test/1960-obsolete-jit-multithread-native/Android.bp b/test/1960-obsolete-jit-multithread-native/Android.bp
index 27372c8..41f5cf9 100644
--- a/test/1960-obsolete-jit-multithread-native/Android.bp
+++ b/test/1960-obsolete-jit-multithread-native/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1960-obsolete-jit-multithread-native-expected"],
+    data: [":art-run-test-1960-obsolete-jit-multithread-native-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1960-obsolete-jit-multithread-native-expected",
-    out: ["art-run-test-1960-obsolete-jit-multithread-native-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1960-obsolete-jit-multithread-native-expected-stdout",
+    out: ["art-run-test-1960-obsolete-jit-multithread-native-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1960-obsolete-jit-multithread-native/expected-stdout.txt

diff --git a/test/1960-obsolete-jit-multithread-native/expected.txt b/test/1960-obsolete-jit-multithread-native/expected-stdout.txt
similarity index 100%
rename from test/1960-obsolete-jit-multithread-native/expected.txt
rename to test/1960-obsolete-jit-multithread-native/expected-stdout.txt

test/1961-checker-loop-vectorizer/Android.bp

diff --git a/test/1961-checker-loop-vectorizer/Android.bp b/test/1961-checker-loop-vectorizer/Android.bp
index 2ad4861..4a7c094 100644
--- a/test/1961-checker-loop-vectorizer/Android.bp
+++ b/test/1961-checker-loop-vectorizer/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1961-checker-loop-vectorizer-expected"],
+    data: [":art-run-test-1961-checker-loop-vectorizer-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1961-checker-loop-vectorizer-expected",
-    out: ["art-run-test-1961-checker-loop-vectorizer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1961-checker-loop-vectorizer-expected-stdout",
+    out: ["art-run-test-1961-checker-loop-vectorizer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1961-checker-loop-vectorizer/expected-stdout.txt

diff --git a/test/1961-checker-loop-vectorizer/expected.txt b/test/1961-checker-loop-vectorizer/expected-stdout.txt
similarity index 100%
rename from test/1961-checker-loop-vectorizer/expected.txt
rename to test/1961-checker-loop-vectorizer/expected-stdout.txt

test/1961-obsolete-jit-multithread/Android.bp

diff --git a/test/1961-obsolete-jit-multithread/Android.bp b/test/1961-obsolete-jit-multithread/Android.bp
index 6d47674..aaacaf6 100644
--- a/test/1961-obsolete-jit-multithread/Android.bp
+++ b/test/1961-obsolete-jit-multithread/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1961-obsolete-jit-multithread-expected"],
+    data: [":art-run-test-1961-obsolete-jit-multithread-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1961-obsolete-jit-multithread-expected",
-    out: ["art-run-test-1961-obsolete-jit-multithread-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1961-obsolete-jit-multithread-expected-stdout",
+    out: ["art-run-test-1961-obsolete-jit-multithread-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1961-obsolete-jit-multithread/expected-stdout.txt

diff --git a/test/1961-obsolete-jit-multithread/expected.txt b/test/1961-obsolete-jit-multithread/expected-stdout.txt
similarity index 100%
rename from test/1961-obsolete-jit-multithread/expected.txt
rename to test/1961-obsolete-jit-multithread/expected-stdout.txt

test/1962-multi-thread-events/Android.bp

diff --git a/test/1962-multi-thread-events/Android.bp b/test/1962-multi-thread-events/Android.bp
index ed8f5e3..005ecf2 100644
--- a/test/1962-multi-thread-events/Android.bp
+++ b/test/1962-multi-thread-events/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1962-multi-thread-events-expected"],
+    data: [":art-run-test-1962-multi-thread-events-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1962-multi-thread-events-expected",
-    out: ["art-run-test-1962-multi-thread-events-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1962-multi-thread-events-expected-stdout",
+    out: ["art-run-test-1962-multi-thread-events-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1962-multi-thread-events/expected-stdout.txt

diff --git a/test/1962-multi-thread-events/expected.txt b/test/1962-multi-thread-events/expected-stdout.txt
similarity index 100%
rename from test/1962-multi-thread-events/expected.txt
rename to test/1962-multi-thread-events/expected-stdout.txt

test/1963-add-to-dex-classloader-in-memory/Android.bp

diff --git a/test/1963-add-to-dex-classloader-in-memory/Android.bp b/test/1963-add-to-dex-classloader-in-memory/Android.bp
index bf915ed..a9eb0d0 100644
--- a/test/1963-add-to-dex-classloader-in-memory/Android.bp
+++ b/test/1963-add-to-dex-classloader-in-memory/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1963-add-to-dex-classloader-in-memory-expected"],
+    data: [":art-run-test-1963-add-to-dex-classloader-in-memory-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1963-add-to-dex-classloader-in-memory-expected",
-    out: ["art-run-test-1963-add-to-dex-classloader-in-memory-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1963-add-to-dex-classloader-in-memory-expected-stdout",
+    out: ["art-run-test-1963-add-to-dex-classloader-in-memory-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1963-add-to-dex-classloader-in-memory/expected-stdout.txt

diff --git a/test/1963-add-to-dex-classloader-in-memory/expected.txt b/test/1963-add-to-dex-classloader-in-memory/expected-stdout.txt
similarity index 100%
rename from test/1963-add-to-dex-classloader-in-memory/expected.txt
rename to test/1963-add-to-dex-classloader-in-memory/expected-stdout.txt

test/1964-add-to-dex-classloader-file/expected-stdout.txt

diff --git a/test/1964-add-to-dex-classloader-file/expected.txt b/test/1964-add-to-dex-classloader-file/expected-stdout.txt
similarity index 100%
rename from test/1964-add-to-dex-classloader-file/expected.txt
rename to test/1964-add-to-dex-classloader-file/expected-stdout.txt

test/1965-get-set-local-primitive-no-tables/expected-stdout.txt

diff --git a/test/1965-get-set-local-primitive-no-tables/expected.txt b/test/1965-get-set-local-primitive-no-tables/expected-stdout.txt
similarity index 100%
rename from test/1965-get-set-local-primitive-no-tables/expected.txt
rename to test/1965-get-set-local-primitive-no-tables/expected-stdout.txt

test/1966-get-set-local-objects-no-table/expected-stdout.txt

diff --git a/test/1966-get-set-local-objects-no-table/expected.txt b/test/1966-get-set-local-objects-no-table/expected-stdout.txt
similarity index 100%
rename from test/1966-get-set-local-objects-no-table/expected.txt
rename to test/1966-get-set-local-objects-no-table/expected-stdout.txt

test/1967-get-set-local-bad-slot/Android.bp

diff --git a/test/1967-get-set-local-bad-slot/Android.bp b/test/1967-get-set-local-bad-slot/Android.bp
index 654b7e6..8eec585 100644
--- a/test/1967-get-set-local-bad-slot/Android.bp
+++ b/test/1967-get-set-local-bad-slot/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1967-get-set-local-bad-slot-expected"],
+    data: [":art-run-test-1967-get-set-local-bad-slot-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1967-get-set-local-bad-slot-expected",
-    out: ["art-run-test-1967-get-set-local-bad-slot-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1967-get-set-local-bad-slot-expected-stdout",
+    out: ["art-run-test-1967-get-set-local-bad-slot-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1967-get-set-local-bad-slot/expected-stdout.txt

diff --git a/test/1967-get-set-local-bad-slot/expected.txt b/test/1967-get-set-local-bad-slot/expected-stdout.txt
similarity index 100%
rename from test/1967-get-set-local-bad-slot/expected.txt
rename to test/1967-get-set-local-bad-slot/expected-stdout.txt

test/1968-force-early-return/Android.bp

diff --git a/test/1968-force-early-return/Android.bp b/test/1968-force-early-return/Android.bp
index 0dcd0ae..c7c74fc 100644
--- a/test/1968-force-early-return/Android.bp
+++ b/test/1968-force-early-return/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1968-force-early-return-expected"],
+    data: [":art-run-test-1968-force-early-return-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1968-force-early-return-expected",
-    out: ["art-run-test-1968-force-early-return-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1968-force-early-return-expected-stdout",
+    out: ["art-run-test-1968-force-early-return-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1968-force-early-return/expected-stdout.txt

diff --git a/test/1968-force-early-return/expected.txt b/test/1968-force-early-return/expected-stdout.txt
similarity index 100%
rename from test/1968-force-early-return/expected.txt
rename to test/1968-force-early-return/expected-stdout.txt

test/1969-force-early-return-void/Android.bp

diff --git a/test/1969-force-early-return-void/Android.bp b/test/1969-force-early-return-void/Android.bp
index 7d5d40f..f08a3dd 100644
--- a/test/1969-force-early-return-void/Android.bp
+++ b/test/1969-force-early-return-void/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1969-force-early-return-void-expected"],
+    data: [":art-run-test-1969-force-early-return-void-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1969-force-early-return-void-expected",
-    out: ["art-run-test-1969-force-early-return-void-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1969-force-early-return-void-expected-stdout",
+    out: ["art-run-test-1969-force-early-return-void-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1969-force-early-return-void/check

diff --git a/test/1969-force-early-return-void/check b/test/1969-force-early-return-void/check
index d552272..43a9218 100755
--- a/test/1969-force-early-return-void/check
+++ b/test/1969-force-early-return-void/check
@@ -18,4 +18,4 @@
 # See b/116003018. Some configurations cannot handle the class load events in
 # quite the right way so they are disabled there too.
 ./default-check "$@" || \
-  (patch -p0 expected.txt < class-loading-expected.patch >/dev/null && ./default-check "$@")
+  (patch -p0 expected-stdout.txt < class-loading-expected.patch >/dev/null && ./default-check "$@")

test/1969-force-early-return-void/expected-stdout.txt

diff --git a/test/1969-force-early-return-void/expected.txt b/test/1969-force-early-return-void/expected-stdout.txt
similarity index 100%
rename from test/1969-force-early-return-void/expected.txt
rename to test/1969-force-early-return-void/expected-stdout.txt

test/1970-force-early-return-long/Android.bp

diff --git a/test/1970-force-early-return-long/Android.bp b/test/1970-force-early-return-long/Android.bp
index 754362e..5d51ae0 100644
--- a/test/1970-force-early-return-long/Android.bp
+++ b/test/1970-force-early-return-long/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1970-force-early-return-long-expected"],
+    data: [":art-run-test-1970-force-early-return-long-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1970-force-early-return-long-expected",
-    out: ["art-run-test-1970-force-early-return-long-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1970-force-early-return-long-expected-stdout",
+    out: ["art-run-test-1970-force-early-return-long-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1970-force-early-return-long/expected-stdout.txt

diff --git a/test/1970-force-early-return-long/expected.txt b/test/1970-force-early-return-long/expected-stdout.txt
similarity index 100%
rename from test/1970-force-early-return-long/expected.txt
rename to test/1970-force-early-return-long/expected-stdout.txt

test/1971-multi-force-early-return/Android.bp

diff --git a/test/1971-multi-force-early-return/Android.bp b/test/1971-multi-force-early-return/Android.bp
index 07e015d..83b7523 100644
--- a/test/1971-multi-force-early-return/Android.bp
+++ b/test/1971-multi-force-early-return/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1971-multi-force-early-return-expected"],
+    data: [":art-run-test-1971-multi-force-early-return-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1971-multi-force-early-return-expected",
-    out: ["art-run-test-1971-multi-force-early-return-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1971-multi-force-early-return-expected-stdout",
+    out: ["art-run-test-1971-multi-force-early-return-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1971-multi-force-early-return/expected-stdout.txt

diff --git a/test/1971-multi-force-early-return/expected.txt b/test/1971-multi-force-early-return/expected-stdout.txt
similarity index 100%
rename from test/1971-multi-force-early-return/expected.txt
rename to test/1971-multi-force-early-return/expected-stdout.txt

test/1972-jni-id-swap-indices/Android.bp

diff --git a/test/1972-jni-id-swap-indices/Android.bp b/test/1972-jni-id-swap-indices/Android.bp
index 17a052a..db4921c 100644
--- a/test/1972-jni-id-swap-indices/Android.bp
+++ b/test/1972-jni-id-swap-indices/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1972-jni-id-swap-indices-expected"],
+    data: [":art-run-test-1972-jni-id-swap-indices-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1972-jni-id-swap-indices-expected",
-    out: ["art-run-test-1972-jni-id-swap-indices-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1972-jni-id-swap-indices-expected-stdout",
+    out: ["art-run-test-1972-jni-id-swap-indices-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1972-jni-id-swap-indices/expected-stdout.txt

diff --git a/test/1972-jni-id-swap-indices/expected.txt b/test/1972-jni-id-swap-indices/expected-stdout.txt
similarity index 100%
rename from test/1972-jni-id-swap-indices/expected.txt
rename to test/1972-jni-id-swap-indices/expected-stdout.txt

test/1973-jni-id-swap-pointer/Android.bp

diff --git a/test/1973-jni-id-swap-pointer/Android.bp b/test/1973-jni-id-swap-pointer/Android.bp
index ac64c79..192fcb6 100644
--- a/test/1973-jni-id-swap-pointer/Android.bp
+++ b/test/1973-jni-id-swap-pointer/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1973-jni-id-swap-pointer-expected"],
+    data: [":art-run-test-1973-jni-id-swap-pointer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1973-jni-id-swap-pointer-expected",
-    out: ["art-run-test-1973-jni-id-swap-pointer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1973-jni-id-swap-pointer-expected-stdout",
+    out: ["art-run-test-1973-jni-id-swap-pointer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1973-jni-id-swap-pointer/expected-stdout.txt

diff --git a/test/1973-jni-id-swap-pointer/expected.txt b/test/1973-jni-id-swap-pointer/expected-stdout.txt
similarity index 100%
rename from test/1973-jni-id-swap-pointer/expected.txt
rename to test/1973-jni-id-swap-pointer/expected-stdout.txt

test/1974-resize-array/Android.bp

diff --git a/test/1974-resize-array/Android.bp b/test/1974-resize-array/Android.bp
index ae66033..86cc1d4 100644
--- a/test/1974-resize-array/Android.bp
+++ b/test/1974-resize-array/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1974-resize-array-expected"],
+    data: [":art-run-test-1974-resize-array-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1974-resize-array-expected",
-    out: ["art-run-test-1974-resize-array-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1974-resize-array-expected-stdout",
+    out: ["art-run-test-1974-resize-array-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1974-resize-array/expected-stdout.txt

diff --git a/test/1974-resize-array/expected.txt b/test/1974-resize-array/expected-stdout.txt
similarity index 100%
rename from test/1974-resize-array/expected.txt
rename to test/1974-resize-array/expected-stdout.txt

test/1975-hello-structural-transformation/Android.bp

diff --git a/test/1975-hello-structural-transformation/Android.bp b/test/1975-hello-structural-transformation/Android.bp
index b82fdf1..26718e0 100644
--- a/test/1975-hello-structural-transformation/Android.bp
+++ b/test/1975-hello-structural-transformation/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1975-hello-structural-transformation-expected"],
+    data: [":art-run-test-1975-hello-structural-transformation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1975-hello-structural-transformation-expected",
-    out: ["art-run-test-1975-hello-structural-transformation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1975-hello-structural-transformation-expected-stdout",
+    out: ["art-run-test-1975-hello-structural-transformation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1975-hello-structural-transformation/expected-stdout.txt

diff --git a/test/1975-hello-structural-transformation/expected.txt b/test/1975-hello-structural-transformation/expected-stdout.txt
similarity index 100%
rename from test/1975-hello-structural-transformation/expected.txt
rename to test/1975-hello-structural-transformation/expected-stdout.txt

test/1976-hello-structural-static-methods/Android.bp

diff --git a/test/1976-hello-structural-static-methods/Android.bp b/test/1976-hello-structural-static-methods/Android.bp
index e062149..a3e251b 100644
--- a/test/1976-hello-structural-static-methods/Android.bp
+++ b/test/1976-hello-structural-static-methods/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1976-hello-structural-static-methods-expected"],
+    data: [":art-run-test-1976-hello-structural-static-methods-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1976-hello-structural-static-methods-expected",
-    out: ["art-run-test-1976-hello-structural-static-methods-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1976-hello-structural-static-methods-expected-stdout",
+    out: ["art-run-test-1976-hello-structural-static-methods-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1976-hello-structural-static-methods/expected-stdout.txt

diff --git a/test/1976-hello-structural-static-methods/expected.txt b/test/1976-hello-structural-static-methods/expected-stdout.txt
similarity index 100%
rename from test/1976-hello-structural-static-methods/expected.txt
rename to test/1976-hello-structural-static-methods/expected-stdout.txt

test/1977-hello-structural-obsolescence/Android.bp

diff --git a/test/1977-hello-structural-obsolescence/Android.bp b/test/1977-hello-structural-obsolescence/Android.bp
index 44e0f9f..5ec242d 100644
--- a/test/1977-hello-structural-obsolescence/Android.bp
+++ b/test/1977-hello-structural-obsolescence/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1977-hello-structural-obsolescence-expected"],
+    data: [":art-run-test-1977-hello-structural-obsolescence-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1977-hello-structural-obsolescence-expected",
-    out: ["art-run-test-1977-hello-structural-obsolescence-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1977-hello-structural-obsolescence-expected-stdout",
+    out: ["art-run-test-1977-hello-structural-obsolescence-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1977-hello-structural-obsolescence/expected-stdout.txt

diff --git a/test/1977-hello-structural-obsolescence/expected.txt b/test/1977-hello-structural-obsolescence/expected-stdout.txt
similarity index 100%
rename from test/1977-hello-structural-obsolescence/expected.txt
rename to test/1977-hello-structural-obsolescence/expected-stdout.txt

test/1978-regular-obsolete-then-structural-obsolescence/Android.bp

diff --git a/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp b/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp
index 12fa774..bcb3ee8 100644
--- a/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp
+++ b/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected"],
+    data: [":art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected",
-    out: ["art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected-stdout",
+    out: ["art-run-test-1978-regular-obsolete-then-structural-obsolescence-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1978-regular-obsolete-then-structural-obsolescence/expected-stdout.txt

diff --git a/test/1978-regular-obsolete-then-structural-obsolescence/expected.txt b/test/1978-regular-obsolete-then-structural-obsolescence/expected-stdout.txt
similarity index 100%
rename from test/1978-regular-obsolete-then-structural-obsolescence/expected.txt
rename to test/1978-regular-obsolete-then-structural-obsolescence/expected-stdout.txt

test/1979-threaded-structural-transformation/Android.bp

diff --git a/test/1979-threaded-structural-transformation/Android.bp b/test/1979-threaded-structural-transformation/Android.bp
index 23727fc..f08e65a 100644
--- a/test/1979-threaded-structural-transformation/Android.bp
+++ b/test/1979-threaded-structural-transformation/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1979-threaded-structural-transformation-expected"],
+    data: [":art-run-test-1979-threaded-structural-transformation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1979-threaded-structural-transformation-expected",
-    out: ["art-run-test-1979-threaded-structural-transformation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1979-threaded-structural-transformation-expected-stdout",
+    out: ["art-run-test-1979-threaded-structural-transformation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1979-threaded-structural-transformation/expected-stdout.txt

diff --git a/test/1979-threaded-structural-transformation/expected.txt b/test/1979-threaded-structural-transformation/expected-stdout.txt
similarity index 100%
rename from test/1979-threaded-structural-transformation/expected.txt
rename to test/1979-threaded-structural-transformation/expected-stdout.txt

test/1980-obsolete-object-cleared/Android.bp

diff --git a/test/1980-obsolete-object-cleared/Android.bp b/test/1980-obsolete-object-cleared/Android.bp
index 08bb5d8..20268ee 100644
--- a/test/1980-obsolete-object-cleared/Android.bp
+++ b/test/1980-obsolete-object-cleared/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1980-obsolete-object-cleared-expected"],
+    data: [":art-run-test-1980-obsolete-object-cleared-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1980-obsolete-object-cleared-expected",
-    out: ["art-run-test-1980-obsolete-object-cleared-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1980-obsolete-object-cleared-expected-stdout",
+    out: ["art-run-test-1980-obsolete-object-cleared-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1980-obsolete-object-cleared/expected-stdout.txt

diff --git a/test/1980-obsolete-object-cleared/expected.txt b/test/1980-obsolete-object-cleared/expected-stdout.txt
similarity index 100%
rename from test/1980-obsolete-object-cleared/expected.txt
rename to test/1980-obsolete-object-cleared/expected-stdout.txt

test/1981-structural-redef-private-method-handles/expected-stdout.txt

diff --git a/test/1981-structural-redef-private-method-handles/expected.txt b/test/1981-structural-redef-private-method-handles/expected-stdout.txt
similarity index 100%
rename from test/1981-structural-redef-private-method-handles/expected.txt
rename to test/1981-structural-redef-private-method-handles/expected-stdout.txt

test/1982-no-virtuals-structural-redefinition/Android.bp

diff --git a/test/1982-no-virtuals-structural-redefinition/Android.bp b/test/1982-no-virtuals-structural-redefinition/Android.bp
index 02a5df5..5a752d8 100644
--- a/test/1982-no-virtuals-structural-redefinition/Android.bp
+++ b/test/1982-no-virtuals-structural-redefinition/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1982-no-virtuals-structural-redefinition-expected"],
+    data: [":art-run-test-1982-no-virtuals-structural-redefinition-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1982-no-virtuals-structural-redefinition-expected",
-    out: ["art-run-test-1982-no-virtuals-structural-redefinition-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1982-no-virtuals-structural-redefinition-expected-stdout",
+    out: ["art-run-test-1982-no-virtuals-structural-redefinition-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1982-no-virtuals-structural-redefinition/expected-stdout.txt

diff --git a/test/1982-no-virtuals-structural-redefinition/expected.txt b/test/1982-no-virtuals-structural-redefinition/expected-stdout.txt
similarity index 100%
rename from test/1982-no-virtuals-structural-redefinition/expected.txt
rename to test/1982-no-virtuals-structural-redefinition/expected-stdout.txt

test/1983-structural-redefinition-failures/expected-stdout.txt

diff --git a/test/1983-structural-redefinition-failures/expected.txt b/test/1983-structural-redefinition-failures/expected-stdout.txt
similarity index 100%
rename from test/1983-structural-redefinition-failures/expected.txt
rename to test/1983-structural-redefinition-failures/expected-stdout.txt

test/1984-structural-redefine-field-trace/Android.bp

diff --git a/test/1984-structural-redefine-field-trace/Android.bp b/test/1984-structural-redefine-field-trace/Android.bp
index 00762d1..ec34766 100644
--- a/test/1984-structural-redefine-field-trace/Android.bp
+++ b/test/1984-structural-redefine-field-trace/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1984-structural-redefine-field-trace-expected"],
+    data: [":art-run-test-1984-structural-redefine-field-trace-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1984-structural-redefine-field-trace-expected",
-    out: ["art-run-test-1984-structural-redefine-field-trace-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1984-structural-redefine-field-trace-expected-stdout",
+    out: ["art-run-test-1984-structural-redefine-field-trace-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1984-structural-redefine-field-trace/expected-stdout.txt

diff --git a/test/1984-structural-redefine-field-trace/expected.txt b/test/1984-structural-redefine-field-trace/expected-stdout.txt
similarity index 100%
rename from test/1984-structural-redefine-field-trace/expected.txt
rename to test/1984-structural-redefine-field-trace/expected-stdout.txt

test/1985-structural-redefine-stack-scope/Android.bp

diff --git a/test/1985-structural-redefine-stack-scope/Android.bp b/test/1985-structural-redefine-stack-scope/Android.bp
index a9c42c2..99967f6 100644
--- a/test/1985-structural-redefine-stack-scope/Android.bp
+++ b/test/1985-structural-redefine-stack-scope/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1985-structural-redefine-stack-scope-expected"],
+    data: [":art-run-test-1985-structural-redefine-stack-scope-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1985-structural-redefine-stack-scope-expected",
-    out: ["art-run-test-1985-structural-redefine-stack-scope-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1985-structural-redefine-stack-scope-expected-stdout",
+    out: ["art-run-test-1985-structural-redefine-stack-scope-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1985-structural-redefine-stack-scope/expected-stdout.txt

diff --git a/test/1985-structural-redefine-stack-scope/expected.txt b/test/1985-structural-redefine-stack-scope/expected-stdout.txt
similarity index 100%
rename from test/1985-structural-redefine-stack-scope/expected.txt
rename to test/1985-structural-redefine-stack-scope/expected-stdout.txt

test/1986-structural-redefine-multi-thread-stack-scope/Android.bp

diff --git a/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp b/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp
index d452642..a00bc1b 100644
--- a/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp
+++ b/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected"],
+    data: [":art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected",
-    out: ["art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected-stdout",
+    out: ["art-run-test-1986-structural-redefine-multi-thread-stack-scope-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1986-structural-redefine-multi-thread-stack-scope/expected-stdout.txt

diff --git a/test/1986-structural-redefine-multi-thread-stack-scope/expected.txt b/test/1986-structural-redefine-multi-thread-stack-scope/expected-stdout.txt
similarity index 100%
rename from test/1986-structural-redefine-multi-thread-stack-scope/expected.txt
rename to test/1986-structural-redefine-multi-thread-stack-scope/expected-stdout.txt

test/1987-structural-redefine-recursive-stack-scope/Android.bp

diff --git a/test/1987-structural-redefine-recursive-stack-scope/Android.bp b/test/1987-structural-redefine-recursive-stack-scope/Android.bp
index 75dac8b..52bab7d 100644
--- a/test/1987-structural-redefine-recursive-stack-scope/Android.bp
+++ b/test/1987-structural-redefine-recursive-stack-scope/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1987-structural-redefine-recursive-stack-scope-expected"],
+    data: [":art-run-test-1987-structural-redefine-recursive-stack-scope-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1987-structural-redefine-recursive-stack-scope-expected",
-    out: ["art-run-test-1987-structural-redefine-recursive-stack-scope-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1987-structural-redefine-recursive-stack-scope-expected-stdout",
+    out: ["art-run-test-1987-structural-redefine-recursive-stack-scope-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1987-structural-redefine-recursive-stack-scope/expected-stdout.txt

diff --git a/test/1987-structural-redefine-recursive-stack-scope/expected.txt b/test/1987-structural-redefine-recursive-stack-scope/expected-stdout.txt
similarity index 100%
rename from test/1987-structural-redefine-recursive-stack-scope/expected.txt
rename to test/1987-structural-redefine-recursive-stack-scope/expected-stdout.txt

test/1988-multi-structural-redefine/Android.bp

diff --git a/test/1988-multi-structural-redefine/Android.bp b/test/1988-multi-structural-redefine/Android.bp
index b58b6df..f6e0701 100644
--- a/test/1988-multi-structural-redefine/Android.bp
+++ b/test/1988-multi-structural-redefine/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1988-multi-structural-redefine-expected"],
+    data: [":art-run-test-1988-multi-structural-redefine-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1988-multi-structural-redefine-expected",
-    out: ["art-run-test-1988-multi-structural-redefine-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1988-multi-structural-redefine-expected-stdout",
+    out: ["art-run-test-1988-multi-structural-redefine-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1988-multi-structural-redefine/expected-stdout.txt

diff --git a/test/1988-multi-structural-redefine/expected.txt b/test/1988-multi-structural-redefine/expected-stdout.txt
similarity index 100%
rename from test/1988-multi-structural-redefine/expected.txt
rename to test/1988-multi-structural-redefine/expected-stdout.txt

test/1989-transform-bad-monitor/Android.bp

diff --git a/test/1989-transform-bad-monitor/Android.bp b/test/1989-transform-bad-monitor/Android.bp
index 40342db..9d37e5a 100644
--- a/test/1989-transform-bad-monitor/Android.bp
+++ b/test/1989-transform-bad-monitor/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1989-transform-bad-monitor-expected"],
+    data: [":art-run-test-1989-transform-bad-monitor-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1989-transform-bad-monitor-expected",
-    out: ["art-run-test-1989-transform-bad-monitor-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1989-transform-bad-monitor-expected-stdout",
+    out: ["art-run-test-1989-transform-bad-monitor-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1989-transform-bad-monitor/expected-stdout.txt

diff --git a/test/1989-transform-bad-monitor/expected.txt b/test/1989-transform-bad-monitor/expected-stdout.txt
similarity index 100%
rename from test/1989-transform-bad-monitor/expected.txt
rename to test/1989-transform-bad-monitor/expected-stdout.txt

test/1990-structural-bad-verify/Android.bp

diff --git a/test/1990-structural-bad-verify/Android.bp b/test/1990-structural-bad-verify/Android.bp
index 2bbdb3c..e9447ad 100644
--- a/test/1990-structural-bad-verify/Android.bp
+++ b/test/1990-structural-bad-verify/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1990-structural-bad-verify-expected"],
+    data: [":art-run-test-1990-structural-bad-verify-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1990-structural-bad-verify-expected",
-    out: ["art-run-test-1990-structural-bad-verify-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1990-structural-bad-verify-expected-stdout",
+    out: ["art-run-test-1990-structural-bad-verify-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1990-structural-bad-verify/expected-stdout.txt

diff --git a/test/1990-structural-bad-verify/expected.txt b/test/1990-structural-bad-verify/expected-stdout.txt
similarity index 100%
rename from test/1990-structural-bad-verify/expected.txt
rename to test/1990-structural-bad-verify/expected-stdout.txt

test/1991-hello-structural-retransform/Android.bp

diff --git a/test/1991-hello-structural-retransform/Android.bp b/test/1991-hello-structural-retransform/Android.bp
index 3411cf1..3b48d4a 100644
--- a/test/1991-hello-structural-retransform/Android.bp
+++ b/test/1991-hello-structural-retransform/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1991-hello-structural-retransform-expected"],
+    data: [":art-run-test-1991-hello-structural-retransform-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1991-hello-structural-retransform-expected",
-    out: ["art-run-test-1991-hello-structural-retransform-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1991-hello-structural-retransform-expected-stdout",
+    out: ["art-run-test-1991-hello-structural-retransform-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1991-hello-structural-retransform/expected-stdout.txt

diff --git a/test/1991-hello-structural-retransform/expected.txt b/test/1991-hello-structural-retransform/expected-stdout.txt
similarity index 100%
rename from test/1991-hello-structural-retransform/expected.txt
rename to test/1991-hello-structural-retransform/expected-stdout.txt

test/1992-retransform-no-such-field/Android.bp

diff --git a/test/1992-retransform-no-such-field/Android.bp b/test/1992-retransform-no-such-field/Android.bp
index 8621df7..4921500 100644
--- a/test/1992-retransform-no-such-field/Android.bp
+++ b/test/1992-retransform-no-such-field/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1992-retransform-no-such-field-expected"],
+    data: [":art-run-test-1992-retransform-no-such-field-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1992-retransform-no-such-field-expected",
-    out: ["art-run-test-1992-retransform-no-such-field-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1992-retransform-no-such-field-expected-stdout",
+    out: ["art-run-test-1992-retransform-no-such-field-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1992-retransform-no-such-field/expected-stdout.txt

diff --git a/test/1992-retransform-no-such-field/expected.txt b/test/1992-retransform-no-such-field/expected-stdout.txt
similarity index 100%
rename from test/1992-retransform-no-such-field/expected.txt
rename to test/1992-retransform-no-such-field/expected-stdout.txt

test/1993-fallback-non-structural/Android.bp

diff --git a/test/1993-fallback-non-structural/Android.bp b/test/1993-fallback-non-structural/Android.bp
index 6b7a326..8ba0636 100644
--- a/test/1993-fallback-non-structural/Android.bp
+++ b/test/1993-fallback-non-structural/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1993-fallback-non-structural-expected"],
+    data: [":art-run-test-1993-fallback-non-structural-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1993-fallback-non-structural-expected",
-    out: ["art-run-test-1993-fallback-non-structural-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1993-fallback-non-structural-expected-stdout",
+    out: ["art-run-test-1993-fallback-non-structural-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1993-fallback-non-structural/expected-stdout.txt

diff --git a/test/1993-fallback-non-structural/expected.txt b/test/1993-fallback-non-structural/expected-stdout.txt
similarity index 100%
rename from test/1993-fallback-non-structural/expected.txt
rename to test/1993-fallback-non-structural/expected-stdout.txt

test/1994-final-virtual-structural/Android.bp

diff --git a/test/1994-final-virtual-structural/Android.bp b/test/1994-final-virtual-structural/Android.bp
index 676f962..90c6e96 100644
--- a/test/1994-final-virtual-structural/Android.bp
+++ b/test/1994-final-virtual-structural/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1994-final-virtual-structural-expected"],
+    data: [":art-run-test-1994-final-virtual-structural-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1994-final-virtual-structural-expected",
-    out: ["art-run-test-1994-final-virtual-structural-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1994-final-virtual-structural-expected-stdout",
+    out: ["art-run-test-1994-final-virtual-structural-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1994-final-virtual-structural/expected-stdout.txt

diff --git a/test/1994-final-virtual-structural/expected.txt b/test/1994-final-virtual-structural/expected-stdout.txt
similarity index 100%
rename from test/1994-final-virtual-structural/expected.txt
rename to test/1994-final-virtual-structural/expected-stdout.txt

test/1995-final-virtual-structural-multithread/Android.bp

diff --git a/test/1995-final-virtual-structural-multithread/Android.bp b/test/1995-final-virtual-structural-multithread/Android.bp
index 49b205c..fbed287 100644
--- a/test/1995-final-virtual-structural-multithread/Android.bp
+++ b/test/1995-final-virtual-structural-multithread/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1995-final-virtual-structural-multithread-expected"],
+    data: [":art-run-test-1995-final-virtual-structural-multithread-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1995-final-virtual-structural-multithread-expected",
-    out: ["art-run-test-1995-final-virtual-structural-multithread-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1995-final-virtual-structural-multithread-expected-stdout",
+    out: ["art-run-test-1995-final-virtual-structural-multithread-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1995-final-virtual-structural-multithread/expected-stdout.txt

diff --git a/test/1995-final-virtual-structural-multithread/expected.txt b/test/1995-final-virtual-structural-multithread/expected-stdout.txt
similarity index 100%
rename from test/1995-final-virtual-structural-multithread/expected.txt
rename to test/1995-final-virtual-structural-multithread/expected-stdout.txt

test/1996-final-override-virtual-structural/Android.bp

diff --git a/test/1996-final-override-virtual-structural/Android.bp b/test/1996-final-override-virtual-structural/Android.bp
index 3322a26..674646e 100644
--- a/test/1996-final-override-virtual-structural/Android.bp
+++ b/test/1996-final-override-virtual-structural/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1996-final-override-virtual-structural-expected"],
+    data: [":art-run-test-1996-final-override-virtual-structural-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1996-final-override-virtual-structural-expected",
-    out: ["art-run-test-1996-final-override-virtual-structural-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1996-final-override-virtual-structural-expected-stdout",
+    out: ["art-run-test-1996-final-override-virtual-structural-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1996-final-override-virtual-structural/expected-stdout.txt

diff --git a/test/1996-final-override-virtual-structural/expected.txt b/test/1996-final-override-virtual-structural/expected-stdout.txt
similarity index 100%
rename from test/1996-final-override-virtual-structural/expected.txt
rename to test/1996-final-override-virtual-structural/expected-stdout.txt

test/1997-structural-shadow-method/Android.bp

diff --git a/test/1997-structural-shadow-method/Android.bp b/test/1997-structural-shadow-method/Android.bp
index 0f971c9..7dd0b2b 100644
--- a/test/1997-structural-shadow-method/Android.bp
+++ b/test/1997-structural-shadow-method/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1997-structural-shadow-method-expected"],
+    data: [":art-run-test-1997-structural-shadow-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1997-structural-shadow-method-expected",
-    out: ["art-run-test-1997-structural-shadow-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1997-structural-shadow-method-expected-stdout",
+    out: ["art-run-test-1997-structural-shadow-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1997-structural-shadow-method/expected-stdout.txt

diff --git a/test/1997-structural-shadow-method/expected.txt b/test/1997-structural-shadow-method/expected-stdout.txt
similarity index 100%
rename from test/1997-structural-shadow-method/expected.txt
rename to test/1997-structural-shadow-method/expected-stdout.txt

test/1998-structural-shadow-field/Android.bp

diff --git a/test/1998-structural-shadow-field/Android.bp b/test/1998-structural-shadow-field/Android.bp
index 4d09189..927b972 100644
--- a/test/1998-structural-shadow-field/Android.bp
+++ b/test/1998-structural-shadow-field/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1998-structural-shadow-field-expected"],
+    data: [":art-run-test-1998-structural-shadow-field-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1998-structural-shadow-field-expected",
-    out: ["art-run-test-1998-structural-shadow-field-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1998-structural-shadow-field-expected-stdout",
+    out: ["art-run-test-1998-structural-shadow-field-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1998-structural-shadow-field/expected-stdout.txt

diff --git a/test/1998-structural-shadow-field/expected.txt b/test/1998-structural-shadow-field/expected-stdout.txt
similarity index 100%
rename from test/1998-structural-shadow-field/expected.txt
rename to test/1998-structural-shadow-field/expected-stdout.txt

test/1999-virtual-structural/Android.bp

diff --git a/test/1999-virtual-structural/Android.bp b/test/1999-virtual-structural/Android.bp
index 4def4c6..5dfe4d6 100644
--- a/test/1999-virtual-structural/Android.bp
+++ b/test/1999-virtual-structural/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-1999-virtual-structural-expected"],
+    data: [":art-run-test-1999-virtual-structural-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-1999-virtual-structural-expected",
-    out: ["art-run-test-1999-virtual-structural-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-1999-virtual-structural-expected-stdout",
+    out: ["art-run-test-1999-virtual-structural-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/1999-virtual-structural/expected-stdout.txt

diff --git a/test/1999-virtual-structural/expected.txt b/test/1999-virtual-structural/expected-stdout.txt
similarity index 100%
rename from test/1999-virtual-structural/expected.txt
rename to test/1999-virtual-structural/expected-stdout.txt

test/2000-virtual-list-structural/expected-stdout.txt

diff --git a/test/2000-virtual-list-structural/expected.txt b/test/2000-virtual-list-structural/expected-stdout.txt
similarity index 100%
rename from test/2000-virtual-list-structural/expected.txt
rename to test/2000-virtual-list-structural/expected-stdout.txt

test/2001-virtual-structural-multithread/expected-stdout.txt

diff --git a/test/2001-virtual-structural-multithread/expected.txt b/test/2001-virtual-structural-multithread/expected-stdout.txt
similarity index 100%
rename from test/2001-virtual-structural-multithread/expected.txt
rename to test/2001-virtual-structural-multithread/expected-stdout.txt

test/2002-virtual-structural-initializing/expected-stdout.txt

diff --git a/test/2002-virtual-structural-initializing/expected.txt b/test/2002-virtual-structural-initializing/expected-stdout.txt
similarity index 100%
rename from test/2002-virtual-structural-initializing/expected.txt
rename to test/2002-virtual-structural-initializing/expected-stdout.txt

test/2003-double-virtual-structural/Android.bp

diff --git a/test/2003-double-virtual-structural/Android.bp b/test/2003-double-virtual-structural/Android.bp
index 3b6cdca..f41bd4b 100644
--- a/test/2003-double-virtual-structural/Android.bp
+++ b/test/2003-double-virtual-structural/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2003-double-virtual-structural-expected"],
+    data: [":art-run-test-2003-double-virtual-structural-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2003-double-virtual-structural-expected",
-    out: ["art-run-test-2003-double-virtual-structural-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2003-double-virtual-structural-expected-stdout",
+    out: ["art-run-test-2003-double-virtual-structural-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2003-double-virtual-structural/expected-stdout.txt

diff --git a/test/2003-double-virtual-structural/expected.txt b/test/2003-double-virtual-structural/expected-stdout.txt
similarity index 100%
rename from test/2003-double-virtual-structural/expected.txt
rename to test/2003-double-virtual-structural/expected-stdout.txt

test/2004-double-virtual-structural-abstract/Android.bp

diff --git a/test/2004-double-virtual-structural-abstract/Android.bp b/test/2004-double-virtual-structural-abstract/Android.bp
index 60980f3..90acdd7 100644
--- a/test/2004-double-virtual-structural-abstract/Android.bp
+++ b/test/2004-double-virtual-structural-abstract/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2004-double-virtual-structural-abstract-expected"],
+    data: [":art-run-test-2004-double-virtual-structural-abstract-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2004-double-virtual-structural-abstract-expected",
-    out: ["art-run-test-2004-double-virtual-structural-abstract-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2004-double-virtual-structural-abstract-expected-stdout",
+    out: ["art-run-test-2004-double-virtual-structural-abstract-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2004-double-virtual-structural-abstract/expected-stdout.txt

diff --git a/test/2004-double-virtual-structural-abstract/expected.txt b/test/2004-double-virtual-structural-abstract/expected-stdout.txt
similarity index 100%
rename from test/2004-double-virtual-structural-abstract/expected.txt
rename to test/2004-double-virtual-structural-abstract/expected-stdout.txt

test/2005-pause-all-redefine-multithreaded/Android.bp

diff --git a/test/2005-pause-all-redefine-multithreaded/Android.bp b/test/2005-pause-all-redefine-multithreaded/Android.bp
index 67aa6f5..20298b5 100644
--- a/test/2005-pause-all-redefine-multithreaded/Android.bp
+++ b/test/2005-pause-all-redefine-multithreaded/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2005-pause-all-redefine-multithreaded-expected"],
+    data: [":art-run-test-2005-pause-all-redefine-multithreaded-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2005-pause-all-redefine-multithreaded-expected",
-    out: ["art-run-test-2005-pause-all-redefine-multithreaded-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2005-pause-all-redefine-multithreaded-expected-stdout",
+    out: ["art-run-test-2005-pause-all-redefine-multithreaded-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2005-pause-all-redefine-multithreaded/expected-stdout.txt

diff --git a/test/2005-pause-all-redefine-multithreaded/expected.txt b/test/2005-pause-all-redefine-multithreaded/expected-stdout.txt
similarity index 100%
rename from test/2005-pause-all-redefine-multithreaded/expected.txt
rename to test/2005-pause-all-redefine-multithreaded/expected-stdout.txt

test/2006-virtual-structural-finalizing/expected-stdout.txt

diff --git a/test/2006-virtual-structural-finalizing/expected.txt b/test/2006-virtual-structural-finalizing/expected-stdout.txt
similarity index 100%
rename from test/2006-virtual-structural-finalizing/expected.txt
rename to test/2006-virtual-structural-finalizing/expected-stdout.txt

test/2007-virtual-structural-finalizable/expected-stdout.txt

diff --git a/test/2007-virtual-structural-finalizable/expected.txt b/test/2007-virtual-structural-finalizable/expected-stdout.txt
similarity index 100%
rename from test/2007-virtual-structural-finalizable/expected.txt
rename to test/2007-virtual-structural-finalizable/expected-stdout.txt

test/2008-redefine-then-old-reflect-field/Android.bp

diff --git a/test/2008-redefine-then-old-reflect-field/Android.bp b/test/2008-redefine-then-old-reflect-field/Android.bp
index 07302a3..eb51639 100644
--- a/test/2008-redefine-then-old-reflect-field/Android.bp
+++ b/test/2008-redefine-then-old-reflect-field/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2008-redefine-then-old-reflect-field-expected"],
+    data: [":art-run-test-2008-redefine-then-old-reflect-field-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2008-redefine-then-old-reflect-field-expected",
-    out: ["art-run-test-2008-redefine-then-old-reflect-field-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2008-redefine-then-old-reflect-field-expected-stdout",
+    out: ["art-run-test-2008-redefine-then-old-reflect-field-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2008-redefine-then-old-reflect-field/expected-stdout.txt

diff --git a/test/2008-redefine-then-old-reflect-field/expected.txt b/test/2008-redefine-then-old-reflect-field/expected-stdout.txt
similarity index 100%
rename from test/2008-redefine-then-old-reflect-field/expected.txt
rename to test/2008-redefine-then-old-reflect-field/expected-stdout.txt

test/2009-structural-local-ref/expected-stdout.txt

diff --git a/test/2009-structural-local-ref/expected.txt b/test/2009-structural-local-ref/expected-stdout.txt
similarity index 100%
rename from test/2009-structural-local-ref/expected.txt
rename to test/2009-structural-local-ref/expected-stdout.txt

test/201-built-in-except-detail-messages/Android.bp

diff --git a/test/201-built-in-except-detail-messages/Android.bp b/test/201-built-in-except-detail-messages/Android.bp
index 23a3ddd..8e09d7e 100644
--- a/test/201-built-in-except-detail-messages/Android.bp
+++ b/test/201-built-in-except-detail-messages/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-201-built-in-except-detail-messages-expected"],
+    data: [":art-run-test-201-built-in-except-detail-messages-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-201-built-in-except-detail-messages-expected",
-    out: ["art-run-test-201-built-in-except-detail-messages-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-201-built-in-except-detail-messages-expected-stdout",
+    out: ["art-run-test-201-built-in-except-detail-messages-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/201-built-in-except-detail-messages/expected-stdout.txt

diff --git a/test/201-built-in-except-detail-messages/expected.txt b/test/201-built-in-except-detail-messages/expected-stdout.txt
similarity index 100%
rename from test/201-built-in-except-detail-messages/expected.txt
rename to test/201-built-in-except-detail-messages/expected-stdout.txt

test/2011-stack-walk-concurrent-instrument/Android.bp

diff --git a/test/2011-stack-walk-concurrent-instrument/Android.bp b/test/2011-stack-walk-concurrent-instrument/Android.bp
index efaf211..5c17498 100644
--- a/test/2011-stack-walk-concurrent-instrument/Android.bp
+++ b/test/2011-stack-walk-concurrent-instrument/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2011-stack-walk-concurrent-instrument-expected"],
+    data: [":art-run-test-2011-stack-walk-concurrent-instrument-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2011-stack-walk-concurrent-instrument-expected",
-    out: ["art-run-test-2011-stack-walk-concurrent-instrument-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2011-stack-walk-concurrent-instrument-expected-stdout",
+    out: ["art-run-test-2011-stack-walk-concurrent-instrument-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2011-stack-walk-concurrent-instrument/expected-stdout.txt

diff --git a/test/2011-stack-walk-concurrent-instrument/expected.txt b/test/2011-stack-walk-concurrent-instrument/expected-stdout.txt
similarity index 100%
rename from test/2011-stack-walk-concurrent-instrument/expected.txt
rename to test/2011-stack-walk-concurrent-instrument/expected-stdout.txt

test/2012-structural-redefinition-failures-jni-id/expected-stdout.txt

diff --git a/test/2012-structural-redefinition-failures-jni-id/expected.txt b/test/2012-structural-redefinition-failures-jni-id/expected-stdout.txt
similarity index 100%
rename from test/2012-structural-redefinition-failures-jni-id/expected.txt
rename to test/2012-structural-redefinition-failures-jni-id/expected-stdout.txt

test/2019-constantcalculationsinking/Android.bp

diff --git a/test/2019-constantcalculationsinking/Android.bp b/test/2019-constantcalculationsinking/Android.bp
index bab9f74..99ea2e7 100644
--- a/test/2019-constantcalculationsinking/Android.bp
+++ b/test/2019-constantcalculationsinking/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2019-constantcalculationsinking-expected"],
+    data: [":art-run-test-2019-constantcalculationsinking-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2019-constantcalculationsinking-expected",
-    out: ["art-run-test-2019-constantcalculationsinking-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2019-constantcalculationsinking-expected-stdout",
+    out: ["art-run-test-2019-constantcalculationsinking-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2019-constantcalculationsinking/expected-stdout.txt

diff --git a/test/2019-constantcalculationsinking/expected.txt b/test/2019-constantcalculationsinking/expected-stdout.txt
similarity index 100%
rename from test/2019-constantcalculationsinking/expected.txt
rename to test/2019-constantcalculationsinking/expected-stdout.txt

test/202-thread-oome/Android.bp

diff --git a/test/202-thread-oome/Android.bp b/test/202-thread-oome/Android.bp
index 928b9f8..83d4cd3 100644
--- a/test/202-thread-oome/Android.bp
+++ b/test/202-thread-oome/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-202-thread-oome-expected"],
+    data: [":art-run-test-202-thread-oome-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-202-thread-oome-expected",
-    out: ["art-run-test-202-thread-oome-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-202-thread-oome-expected-stdout",
+    out: ["art-run-test-202-thread-oome-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/202-thread-oome/expected-stdout.txt

diff --git a/test/202-thread-oome/expected.txt b/test/202-thread-oome/expected-stdout.txt
similarity index 100%
rename from test/202-thread-oome/expected.txt
rename to test/202-thread-oome/expected-stdout.txt

test/2020-InvokeVirtual-Inlining/Android.bp

diff --git a/test/2020-InvokeVirtual-Inlining/Android.bp b/test/2020-InvokeVirtual-Inlining/Android.bp
index 134820b..1dd5815 100644
--- a/test/2020-InvokeVirtual-Inlining/Android.bp
+++ b/test/2020-InvokeVirtual-Inlining/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2020-InvokeVirtual-Inlining-expected"],
+    data: [":art-run-test-2020-InvokeVirtual-Inlining-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2020-InvokeVirtual-Inlining-expected",
-    out: ["art-run-test-2020-InvokeVirtual-Inlining-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2020-InvokeVirtual-Inlining-expected-stdout",
+    out: ["art-run-test-2020-InvokeVirtual-Inlining-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2020-InvokeVirtual-Inlining/expected-stdout.txt

diff --git a/test/2020-InvokeVirtual-Inlining/expected.txt b/test/2020-InvokeVirtual-Inlining/expected-stdout.txt
similarity index 100%
rename from test/2020-InvokeVirtual-Inlining/expected.txt
rename to test/2020-InvokeVirtual-Inlining/expected-stdout.txt

test/2021-InvokeStatic-Inlining/Android.bp

diff --git a/test/2021-InvokeStatic-Inlining/Android.bp b/test/2021-InvokeStatic-Inlining/Android.bp
index 682d811..f53f42d 100644
--- a/test/2021-InvokeStatic-Inlining/Android.bp
+++ b/test/2021-InvokeStatic-Inlining/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2021-InvokeStatic-Inlining-expected"],
+    data: [":art-run-test-2021-InvokeStatic-Inlining-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2021-InvokeStatic-Inlining-expected",
-    out: ["art-run-test-2021-InvokeStatic-Inlining-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2021-InvokeStatic-Inlining-expected-stdout",
+    out: ["art-run-test-2021-InvokeStatic-Inlining-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2021-InvokeStatic-Inlining/expected-stdout.txt

diff --git a/test/2021-InvokeStatic-Inlining/expected.txt b/test/2021-InvokeStatic-Inlining/expected-stdout.txt
similarity index 100%
rename from test/2021-InvokeStatic-Inlining/expected.txt
rename to test/2021-InvokeStatic-Inlining/expected-stdout.txt

test/2022-Invariantloops/Android.bp

diff --git a/test/2022-Invariantloops/Android.bp b/test/2022-Invariantloops/Android.bp
index a9118e3..c13a337 100644
--- a/test/2022-Invariantloops/Android.bp
+++ b/test/2022-Invariantloops/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2022-Invariantloops-expected"],
+    data: [":art-run-test-2022-Invariantloops-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2022-Invariantloops-expected",
-    out: ["art-run-test-2022-Invariantloops-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2022-Invariantloops-expected-stdout",
+    out: ["art-run-test-2022-Invariantloops-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2022-Invariantloops/expected-stdout.txt

diff --git a/test/2022-Invariantloops/expected.txt b/test/2022-Invariantloops/expected-stdout.txt
similarity index 100%
rename from test/2022-Invariantloops/expected.txt
rename to test/2022-Invariantloops/expected-stdout.txt

test/2023-InvariantLoops_typecast/Android.bp

diff --git a/test/2023-InvariantLoops_typecast/Android.bp b/test/2023-InvariantLoops_typecast/Android.bp
index f993d61..cf4cb4f 100644
--- a/test/2023-InvariantLoops_typecast/Android.bp
+++ b/test/2023-InvariantLoops_typecast/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2023-InvariantLoops_typecast-expected"],
+    data: [":art-run-test-2023-InvariantLoops_typecast-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2023-InvariantLoops_typecast-expected",
-    out: ["art-run-test-2023-InvariantLoops_typecast-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2023-InvariantLoops_typecast-expected-stdout",
+    out: ["art-run-test-2023-InvariantLoops_typecast-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2023-InvariantLoops_typecast/expected-stdout.txt

diff --git a/test/2023-InvariantLoops_typecast/expected.txt b/test/2023-InvariantLoops_typecast/expected-stdout.txt
similarity index 100%
rename from test/2023-InvariantLoops_typecast/expected.txt
rename to test/2023-InvariantLoops_typecast/expected-stdout.txt

test/2024-InvariantNegativeLoop/Android.bp

diff --git a/test/2024-InvariantNegativeLoop/Android.bp b/test/2024-InvariantNegativeLoop/Android.bp
index 115f101..aa7c942 100644
--- a/test/2024-InvariantNegativeLoop/Android.bp
+++ b/test/2024-InvariantNegativeLoop/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2024-InvariantNegativeLoop-expected"],
+    data: [":art-run-test-2024-InvariantNegativeLoop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2024-InvariantNegativeLoop-expected",
-    out: ["art-run-test-2024-InvariantNegativeLoop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2024-InvariantNegativeLoop-expected-stdout",
+    out: ["art-run-test-2024-InvariantNegativeLoop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2024-InvariantNegativeLoop/expected-stdout.txt

diff --git a/test/2024-InvariantNegativeLoop/expected.txt b/test/2024-InvariantNegativeLoop/expected-stdout.txt
similarity index 100%
rename from test/2024-InvariantNegativeLoop/expected.txt
rename to test/2024-InvariantNegativeLoop/expected-stdout.txt

test/2025-ChangedArrayValue/Android.bp

diff --git a/test/2025-ChangedArrayValue/Android.bp b/test/2025-ChangedArrayValue/Android.bp
index 6260dc9..0efec8a 100644
--- a/test/2025-ChangedArrayValue/Android.bp
+++ b/test/2025-ChangedArrayValue/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2025-ChangedArrayValue-expected"],
+    data: [":art-run-test-2025-ChangedArrayValue-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2025-ChangedArrayValue-expected",
-    out: ["art-run-test-2025-ChangedArrayValue-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2025-ChangedArrayValue-expected-stdout",
+    out: ["art-run-test-2025-ChangedArrayValue-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2025-ChangedArrayValue/expected-stdout.txt

diff --git a/test/2025-ChangedArrayValue/expected.txt b/test/2025-ChangedArrayValue/expected-stdout.txt
similarity index 100%
rename from test/2025-ChangedArrayValue/expected.txt
rename to test/2025-ChangedArrayValue/expected-stdout.txt

test/2026-DifferentMemoryLSCouples/Android.bp

diff --git a/test/2026-DifferentMemoryLSCouples/Android.bp b/test/2026-DifferentMemoryLSCouples/Android.bp
index 0d2cd3c..e7ba56f 100644
--- a/test/2026-DifferentMemoryLSCouples/Android.bp
+++ b/test/2026-DifferentMemoryLSCouples/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2026-DifferentMemoryLSCouples-expected"],
+    data: [":art-run-test-2026-DifferentMemoryLSCouples-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2026-DifferentMemoryLSCouples-expected",
-    out: ["art-run-test-2026-DifferentMemoryLSCouples-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2026-DifferentMemoryLSCouples-expected-stdout",
+    out: ["art-run-test-2026-DifferentMemoryLSCouples-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2026-DifferentMemoryLSCouples/expected-stdout.txt

diff --git a/test/2026-DifferentMemoryLSCouples/expected.txt b/test/2026-DifferentMemoryLSCouples/expected-stdout.txt
similarity index 100%
rename from test/2026-DifferentMemoryLSCouples/expected.txt
rename to test/2026-DifferentMemoryLSCouples/expected-stdout.txt

test/2027-TwiceTheSameMemoryCouple/Android.bp

diff --git a/test/2027-TwiceTheSameMemoryCouple/Android.bp b/test/2027-TwiceTheSameMemoryCouple/Android.bp
index 2ff6a91..f6e645d 100644
--- a/test/2027-TwiceTheSameMemoryCouple/Android.bp
+++ b/test/2027-TwiceTheSameMemoryCouple/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2027-TwiceTheSameMemoryCouple-expected"],
+    data: [":art-run-test-2027-TwiceTheSameMemoryCouple-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2027-TwiceTheSameMemoryCouple-expected",
-    out: ["art-run-test-2027-TwiceTheSameMemoryCouple-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2027-TwiceTheSameMemoryCouple-expected-stdout",
+    out: ["art-run-test-2027-TwiceTheSameMemoryCouple-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2027-TwiceTheSameMemoryCouple/expected-stdout.txt

diff --git a/test/2027-TwiceTheSameMemoryCouple/expected.txt b/test/2027-TwiceTheSameMemoryCouple/expected-stdout.txt
similarity index 100%
rename from test/2027-TwiceTheSameMemoryCouple/expected.txt
rename to test/2027-TwiceTheSameMemoryCouple/expected-stdout.txt

test/2028-MultiBackward/Android.bp

diff --git a/test/2028-MultiBackward/Android.bp b/test/2028-MultiBackward/Android.bp
index 45e5e63..73666ae 100644
--- a/test/2028-MultiBackward/Android.bp
+++ b/test/2028-MultiBackward/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2028-MultiBackward-expected"],
+    data: [":art-run-test-2028-MultiBackward-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2028-MultiBackward-expected",
-    out: ["art-run-test-2028-MultiBackward-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2028-MultiBackward-expected-stdout",
+    out: ["art-run-test-2028-MultiBackward-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2028-MultiBackward/expected-stdout.txt

diff --git a/test/2028-MultiBackward/expected.txt b/test/2028-MultiBackward/expected-stdout.txt
similarity index 100%
rename from test/2028-MultiBackward/expected.txt
rename to test/2028-MultiBackward/expected-stdout.txt

test/2029-contended-monitors/Android.bp

diff --git a/test/2029-contended-monitors/Android.bp b/test/2029-contended-monitors/Android.bp
index 9c0067b..fe5e4ce 100644
--- a/test/2029-contended-monitors/Android.bp
+++ b/test/2029-contended-monitors/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2029-contended-monitors-expected"],
+    data: [":art-run-test-2029-contended-monitors-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2029-contended-monitors-expected",
-    out: ["art-run-test-2029-contended-monitors-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2029-contended-monitors-expected-stdout",
+    out: ["art-run-test-2029-contended-monitors-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2029-contended-monitors/expected-stdout.txt

diff --git a/test/2029-contended-monitors/expected.txt b/test/2029-contended-monitors/expected-stdout.txt
similarity index 100%
rename from test/2029-contended-monitors/expected.txt
rename to test/2029-contended-monitors/expected-stdout.txt

test/203-multi-checkpoint/Android.bp

diff --git a/test/203-multi-checkpoint/Android.bp b/test/203-multi-checkpoint/Android.bp
index 80d557a..780a264 100644
--- a/test/203-multi-checkpoint/Android.bp
+++ b/test/203-multi-checkpoint/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-203-multi-checkpoint-expected"],
+    data: [":art-run-test-203-multi-checkpoint-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-203-multi-checkpoint-expected",
-    out: ["art-run-test-203-multi-checkpoint-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-203-multi-checkpoint-expected-stdout",
+    out: ["art-run-test-203-multi-checkpoint-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/203-multi-checkpoint/expected-stdout.txt

diff --git a/test/203-multi-checkpoint/expected.txt b/test/203-multi-checkpoint/expected-stdout.txt
similarity index 100%
rename from test/203-multi-checkpoint/expected.txt
rename to test/203-multi-checkpoint/expected-stdout.txt

test/2030-long-running-child/Android.bp

diff --git a/test/2030-long-running-child/Android.bp b/test/2030-long-running-child/Android.bp
index cfdb7a0..cb61873 100644
--- a/test/2030-long-running-child/Android.bp
+++ b/test/2030-long-running-child/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2030-long-running-child-expected"],
+    data: [":art-run-test-2030-long-running-child-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2030-long-running-child-expected",
-    out: ["art-run-test-2030-long-running-child-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2030-long-running-child-expected-stdout",
+    out: ["art-run-test-2030-long-running-child-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2030-long-running-child/expected-stdout.txt

diff --git a/test/2030-long-running-child/expected.txt b/test/2030-long-running-child/expected-stdout.txt
similarity index 100%
rename from test/2030-long-running-child/expected.txt
rename to test/2030-long-running-child/expected-stdout.txt

test/2031-zygote-compiled-frame-deopt/Android.bp

diff --git a/test/2031-zygote-compiled-frame-deopt/Android.bp b/test/2031-zygote-compiled-frame-deopt/Android.bp
index 6419655..bbd36b4 100644
--- a/test/2031-zygote-compiled-frame-deopt/Android.bp
+++ b/test/2031-zygote-compiled-frame-deopt/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2031-zygote-compiled-frame-deopt-expected"],
+    data: [":art-run-test-2031-zygote-compiled-frame-deopt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2031-zygote-compiled-frame-deopt-expected",
-    out: ["art-run-test-2031-zygote-compiled-frame-deopt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2031-zygote-compiled-frame-deopt-expected-stdout",
+    out: ["art-run-test-2031-zygote-compiled-frame-deopt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2031-zygote-compiled-frame-deopt/expected-stdout.txt

diff --git a/test/2031-zygote-compiled-frame-deopt/expected.txt b/test/2031-zygote-compiled-frame-deopt/expected-stdout.txt
similarity index 100%
rename from test/2031-zygote-compiled-frame-deopt/expected.txt
rename to test/2031-zygote-compiled-frame-deopt/expected-stdout.txt

test/2032-default-method-private-override/expected-stdout.txt

diff --git a/test/2032-default-method-private-override/expected.txt b/test/2032-default-method-private-override/expected-stdout.txt
similarity index 100%
rename from test/2032-default-method-private-override/expected.txt
rename to test/2032-default-method-private-override/expected-stdout.txt

test/2033-shutdown-mechanics/Android.bp

diff --git a/test/2033-shutdown-mechanics/Android.bp b/test/2033-shutdown-mechanics/Android.bp
index f36b49f..8adfa82 100644
--- a/test/2033-shutdown-mechanics/Android.bp
+++ b/test/2033-shutdown-mechanics/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2033-shutdown-mechanics-expected"],
+    data: [":art-run-test-2033-shutdown-mechanics-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2033-shutdown-mechanics-expected",
-    out: ["art-run-test-2033-shutdown-mechanics-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2033-shutdown-mechanics-expected-stdout",
+    out: ["art-run-test-2033-shutdown-mechanics-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2033-shutdown-mechanics/expected-stdout.txt

diff --git a/test/2033-shutdown-mechanics/expected.txt b/test/2033-shutdown-mechanics/expected-stdout.txt
similarity index 100%
rename from test/2033-shutdown-mechanics/expected.txt
rename to test/2033-shutdown-mechanics/expected-stdout.txt

test/2034-spaces-in-SimpleName/expected-stdout.txt

diff --git a/test/2034-spaces-in-SimpleName/expected.txt b/test/2034-spaces-in-SimpleName/expected-stdout.txt
similarity index 100%
rename from test/2034-spaces-in-SimpleName/expected.txt
rename to test/2034-spaces-in-SimpleName/expected-stdout.txt

test/2035-structural-native-method/expected-stdout.txt

diff --git a/test/2035-structural-native-method/expected.txt b/test/2035-structural-native-method/expected-stdout.txt
similarity index 100%
rename from test/2035-structural-native-method/expected.txt
rename to test/2035-structural-native-method/expected-stdout.txt

test/2036-jni-filechannel/Android.bp

diff --git a/test/2036-jni-filechannel/Android.bp b/test/2036-jni-filechannel/Android.bp
index 588794e..f29fc19 100644
--- a/test/2036-jni-filechannel/Android.bp
+++ b/test/2036-jni-filechannel/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2036-jni-filechannel-expected"],
+    data: [":art-run-test-2036-jni-filechannel-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2036-jni-filechannel-expected",
-    out: ["art-run-test-2036-jni-filechannel-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2036-jni-filechannel-expected-stdout",
+    out: ["art-run-test-2036-jni-filechannel-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2036-jni-filechannel/expected-stdout.txt

diff --git a/test/2036-jni-filechannel/expected.txt b/test/2036-jni-filechannel/expected-stdout.txt
similarity index 100%
rename from test/2036-jni-filechannel/expected.txt
rename to test/2036-jni-filechannel/expected-stdout.txt

test/2036-structural-subclass-shadow/expected-stdout.txt

diff --git a/test/2036-structural-subclass-shadow/expected.txt b/test/2036-structural-subclass-shadow/expected-stdout.txt
similarity index 100%
rename from test/2036-structural-subclass-shadow/expected.txt
rename to test/2036-structural-subclass-shadow/expected-stdout.txt

test/2037-thread-name-inherit/Android.bp

diff --git a/test/2037-thread-name-inherit/Android.bp b/test/2037-thread-name-inherit/Android.bp
index e17a8cf..0812c01 100644
--- a/test/2037-thread-name-inherit/Android.bp
+++ b/test/2037-thread-name-inherit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2037-thread-name-inherit-expected"],
+    data: [":art-run-test-2037-thread-name-inherit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2037-thread-name-inherit-expected",
-    out: ["art-run-test-2037-thread-name-inherit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2037-thread-name-inherit-expected-stdout",
+    out: ["art-run-test-2037-thread-name-inherit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2037-thread-name-inherit/expected-stdout.txt

diff --git a/test/2037-thread-name-inherit/expected.txt b/test/2037-thread-name-inherit/expected-stdout.txt
similarity index 100%
rename from test/2037-thread-name-inherit/expected.txt
rename to test/2037-thread-name-inherit/expected-stdout.txt

test/2230-profile-save-hotness/expected-stdout.txt

diff --git a/test/2230-profile-save-hotness/expected.txt b/test/2230-profile-save-hotness/expected-stdout.txt
similarity index 100%
rename from test/2230-profile-save-hotness/expected.txt
rename to test/2230-profile-save-hotness/expected-stdout.txt

test/2231-checker-heap-poisoning/Android.bp

diff --git a/test/2231-checker-heap-poisoning/Android.bp b/test/2231-checker-heap-poisoning/Android.bp
index f873518..f91683c 100644
--- a/test/2231-checker-heap-poisoning/Android.bp
+++ b/test/2231-checker-heap-poisoning/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-2231-checker-heap-poisoning-expected"],
+    data: [":art-run-test-2231-checker-heap-poisoning-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-2231-checker-heap-poisoning-expected",
-    out: ["art-run-test-2231-checker-heap-poisoning-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-2231-checker-heap-poisoning-expected-stdout",
+    out: ["art-run-test-2231-checker-heap-poisoning-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/2231-checker-heap-poisoning/expected-stdout.txt

diff --git a/test/2231-checker-heap-poisoning/expected.txt b/test/2231-checker-heap-poisoning/expected-stdout.txt
similarity index 100%
rename from test/2231-checker-heap-poisoning/expected.txt
rename to test/2231-checker-heap-poisoning/expected-stdout.txt

test/300-package-override/Android.bp

diff --git a/test/300-package-override/Android.bp b/test/300-package-override/Android.bp
index c109207..953d2d3 100644
--- a/test/300-package-override/Android.bp
+++ b/test/300-package-override/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-300-package-override-expected"],
+    data: [":art-run-test-300-package-override-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-300-package-override-expected",
-    out: ["art-run-test-300-package-override-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-300-package-override-expected-stdout",
+    out: ["art-run-test-300-package-override-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/300-package-override/expected-stdout.txt

diff --git a/test/300-package-override/expected.txt b/test/300-package-override/expected-stdout.txt
similarity index 100%
rename from test/300-package-override/expected.txt
rename to test/300-package-override/expected-stdout.txt

test/301-abstract-protected/Android.bp

diff --git a/test/301-abstract-protected/Android.bp b/test/301-abstract-protected/Android.bp
index a4cc45c..df0cc91 100644
--- a/test/301-abstract-protected/Android.bp
+++ b/test/301-abstract-protected/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-301-abstract-protected-expected"],
+    data: [":art-run-test-301-abstract-protected-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-301-abstract-protected-expected",
-    out: ["art-run-test-301-abstract-protected-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-301-abstract-protected-expected-stdout",
+    out: ["art-run-test-301-abstract-protected-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/301-abstract-protected/expected-stdout.txt

diff --git a/test/301-abstract-protected/expected.txt b/test/301-abstract-protected/expected-stdout.txt
similarity index 100%
rename from test/301-abstract-protected/expected.txt
rename to test/301-abstract-protected/expected-stdout.txt

test/302-float-conversion/Android.bp

diff --git a/test/302-float-conversion/Android.bp b/test/302-float-conversion/Android.bp
index 721a34a..66a15fe 100644
--- a/test/302-float-conversion/Android.bp
+++ b/test/302-float-conversion/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-302-float-conversion-expected"],
+    data: [":art-run-test-302-float-conversion-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-302-float-conversion-expected",
-    out: ["art-run-test-302-float-conversion-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-302-float-conversion-expected-stdout",
+    out: ["art-run-test-302-float-conversion-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/302-float-conversion/expected-stdout.txt

diff --git a/test/302-float-conversion/expected.txt b/test/302-float-conversion/expected-stdout.txt
similarity index 100%
rename from test/302-float-conversion/expected.txt
rename to test/302-float-conversion/expected-stdout.txt

test/303-verification-stress/expected-stdout.txt

diff --git a/test/303-verification-stress/expected.txt b/test/303-verification-stress/expected-stdout.txt
similarity index 100%
rename from test/303-verification-stress/expected.txt
rename to test/303-verification-stress/expected-stdout.txt

test/304-method-tracing/Android.bp

diff --git a/test/304-method-tracing/Android.bp b/test/304-method-tracing/Android.bp
index 388dd38..4a3de93 100644
--- a/test/304-method-tracing/Android.bp
+++ b/test/304-method-tracing/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-304-method-tracing-expected"],
+    data: [":art-run-test-304-method-tracing-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-304-method-tracing-expected",
-    out: ["art-run-test-304-method-tracing-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-304-method-tracing-expected-stdout",
+    out: ["art-run-test-304-method-tracing-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/304-method-tracing/expected-stdout.txt

diff --git a/test/304-method-tracing/expected.txt b/test/304-method-tracing/expected-stdout.txt
similarity index 100%
rename from test/304-method-tracing/expected.txt
rename to test/304-method-tracing/expected-stdout.txt

test/305-other-fault-handler/Android.bp

diff --git a/test/305-other-fault-handler/Android.bp b/test/305-other-fault-handler/Android.bp
index 37a05d9..d241ea5 100644
--- a/test/305-other-fault-handler/Android.bp
+++ b/test/305-other-fault-handler/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-305-other-fault-handler-expected"],
+    data: [":art-run-test-305-other-fault-handler-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-305-other-fault-handler-expected",
-    out: ["art-run-test-305-other-fault-handler-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-305-other-fault-handler-expected-stdout",
+    out: ["art-run-test-305-other-fault-handler-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/305-other-fault-handler/expected-stdout.txt

diff --git a/test/305-other-fault-handler/expected.txt b/test/305-other-fault-handler/expected-stdout.txt
similarity index 100%
rename from test/305-other-fault-handler/expected.txt
rename to test/305-other-fault-handler/expected-stdout.txt

test/370-dex-v37/expected-stdout.txt

diff --git a/test/370-dex-v37/expected.txt b/test/370-dex-v37/expected-stdout.txt
similarity index 100%
rename from test/370-dex-v37/expected.txt
rename to test/370-dex-v37/expected-stdout.txt

test/401-optimizing-compiler/Android.bp

diff --git a/test/401-optimizing-compiler/Android.bp b/test/401-optimizing-compiler/Android.bp
index 19cc94a..6dffa22 100644
--- a/test/401-optimizing-compiler/Android.bp
+++ b/test/401-optimizing-compiler/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-401-optimizing-compiler-expected"],
+    data: [":art-run-test-401-optimizing-compiler-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-401-optimizing-compiler-expected",
-    out: ["art-run-test-401-optimizing-compiler-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-401-optimizing-compiler-expected-stdout",
+    out: ["art-run-test-401-optimizing-compiler-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/401-optimizing-compiler/expected-stdout.txt

diff --git a/test/401-optimizing-compiler/expected.txt b/test/401-optimizing-compiler/expected-stdout.txt
similarity index 100%
rename from test/401-optimizing-compiler/expected.txt
rename to test/401-optimizing-compiler/expected-stdout.txt

test/402-optimizing-control-flow/Android.bp

diff --git a/test/402-optimizing-control-flow/Android.bp b/test/402-optimizing-control-flow/Android.bp
index ddc0244..7dd12eb 100644
--- a/test/402-optimizing-control-flow/Android.bp
+++ b/test/402-optimizing-control-flow/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-402-optimizing-control-flow-expected"],
+    data: [":art-run-test-402-optimizing-control-flow-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-402-optimizing-control-flow-expected",
-    out: ["art-run-test-402-optimizing-control-flow-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-402-optimizing-control-flow-expected-stdout",
+    out: ["art-run-test-402-optimizing-control-flow-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/402-optimizing-control-flow/expected-stdout.txt

diff --git a/test/402-optimizing-control-flow/expected.txt b/test/402-optimizing-control-flow/expected-stdout.txt
similarity index 100%
rename from test/402-optimizing-control-flow/expected.txt
rename to test/402-optimizing-control-flow/expected-stdout.txt

test/403-optimizing-long/Android.bp

diff --git a/test/403-optimizing-long/Android.bp b/test/403-optimizing-long/Android.bp
index 9c6fac3..af58501 100644
--- a/test/403-optimizing-long/Android.bp
+++ b/test/403-optimizing-long/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-403-optimizing-long-expected"],
+    data: [":art-run-test-403-optimizing-long-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-403-optimizing-long-expected",
-    out: ["art-run-test-403-optimizing-long-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-403-optimizing-long-expected-stdout",
+    out: ["art-run-test-403-optimizing-long-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/403-optimizing-long/expected-stdout.txt

diff --git a/test/403-optimizing-long/expected.txt b/test/403-optimizing-long/expected-stdout.txt
similarity index 100%
rename from test/403-optimizing-long/expected.txt
rename to test/403-optimizing-long/expected-stdout.txt

test/404-optimizing-allocator/Android.bp

diff --git a/test/404-optimizing-allocator/Android.bp b/test/404-optimizing-allocator/Android.bp
index d7ca988..ec38c4e 100644
--- a/test/404-optimizing-allocator/Android.bp
+++ b/test/404-optimizing-allocator/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-404-optimizing-allocator-expected"],
+    data: [":art-run-test-404-optimizing-allocator-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-404-optimizing-allocator-expected",
-    out: ["art-run-test-404-optimizing-allocator-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-404-optimizing-allocator-expected-stdout",
+    out: ["art-run-test-404-optimizing-allocator-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/404-optimizing-allocator/expected-stdout.txt

diff --git a/test/404-optimizing-allocator/expected.txt b/test/404-optimizing-allocator/expected-stdout.txt
similarity index 100%
rename from test/404-optimizing-allocator/expected.txt
rename to test/404-optimizing-allocator/expected-stdout.txt

test/405-optimizing-long-allocator/Android.bp

diff --git a/test/405-optimizing-long-allocator/Android.bp b/test/405-optimizing-long-allocator/Android.bp
index 50251fc..aea309e 100644
--- a/test/405-optimizing-long-allocator/Android.bp
+++ b/test/405-optimizing-long-allocator/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-405-optimizing-long-allocator-expected"],
+    data: [":art-run-test-405-optimizing-long-allocator-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-405-optimizing-long-allocator-expected",
-    out: ["art-run-test-405-optimizing-long-allocator-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-405-optimizing-long-allocator-expected-stdout",
+    out: ["art-run-test-405-optimizing-long-allocator-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/405-optimizing-long-allocator/expected-stdout.txt

diff --git a/test/405-optimizing-long-allocator/expected.txt b/test/405-optimizing-long-allocator/expected-stdout.txt
similarity index 100%
rename from test/405-optimizing-long-allocator/expected.txt
rename to test/405-optimizing-long-allocator/expected-stdout.txt

test/406-fields/Android.bp

diff --git a/test/406-fields/Android.bp b/test/406-fields/Android.bp
index 6a08f78..68a7812 100644
--- a/test/406-fields/Android.bp
+++ b/test/406-fields/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-406-fields-expected"],
+    data: [":art-run-test-406-fields-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-406-fields-expected",
-    out: ["art-run-test-406-fields-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-406-fields-expected-stdout",
+    out: ["art-run-test-406-fields-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/406-fields/expected-stdout.txt

diff --git a/test/406-fields/expected.txt b/test/406-fields/expected-stdout.txt
similarity index 100%
rename from test/406-fields/expected.txt
rename to test/406-fields/expected-stdout.txt

test/407-arrays/Android.bp

diff --git a/test/407-arrays/Android.bp b/test/407-arrays/Android.bp
index 175cfa6..4698dde 100644
--- a/test/407-arrays/Android.bp
+++ b/test/407-arrays/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-407-arrays-expected"],
+    data: [":art-run-test-407-arrays-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-407-arrays-expected",
-    out: ["art-run-test-407-arrays-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-407-arrays-expected-stdout",
+    out: ["art-run-test-407-arrays-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/407-arrays/expected-stdout.txt

diff --git a/test/407-arrays/expected.txt b/test/407-arrays/expected-stdout.txt
similarity index 100%
rename from test/407-arrays/expected.txt
rename to test/407-arrays/expected-stdout.txt

test/408-move-bug/Android.bp

diff --git a/test/408-move-bug/Android.bp b/test/408-move-bug/Android.bp
index b050b8b..1c2a816 100644
--- a/test/408-move-bug/Android.bp
+++ b/test/408-move-bug/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-408-move-bug-expected"],
+    data: [":art-run-test-408-move-bug-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-408-move-bug-expected",
-    out: ["art-run-test-408-move-bug-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-408-move-bug-expected-stdout",
+    out: ["art-run-test-408-move-bug-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/408-move-bug/expected-stdout.txt

diff --git a/test/408-move-bug/expected.txt b/test/408-move-bug/expected-stdout.txt
similarity index 100%
rename from test/408-move-bug/expected.txt
rename to test/408-move-bug/expected-stdout.txt

test/409-materialized-condition/Android.bp

diff --git a/test/409-materialized-condition/Android.bp b/test/409-materialized-condition/Android.bp
index b41312f..0994a07 100644
--- a/test/409-materialized-condition/Android.bp
+++ b/test/409-materialized-condition/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-409-materialized-condition-expected"],
+    data: [":art-run-test-409-materialized-condition-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-409-materialized-condition-expected",
-    out: ["art-run-test-409-materialized-condition-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-409-materialized-condition-expected-stdout",
+    out: ["art-run-test-409-materialized-condition-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/409-materialized-condition/expected-stdout.txt

diff --git a/test/409-materialized-condition/expected.txt b/test/409-materialized-condition/expected-stdout.txt
similarity index 100%
rename from test/409-materialized-condition/expected.txt
rename to test/409-materialized-condition/expected-stdout.txt

test/410-floats/Android.bp

diff --git a/test/410-floats/Android.bp b/test/410-floats/Android.bp
index 509ea62..09c4317 100644
--- a/test/410-floats/Android.bp
+++ b/test/410-floats/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-410-floats-expected"],
+    data: [":art-run-test-410-floats-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-410-floats-expected",
-    out: ["art-run-test-410-floats-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-410-floats-expected-stdout",
+    out: ["art-run-test-410-floats-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/410-floats/expected-stdout.txt

diff --git a/test/410-floats/expected.txt b/test/410-floats/expected-stdout.txt
similarity index 100%
rename from test/410-floats/expected.txt
rename to test/410-floats/expected-stdout.txt

test/411-checker-hdiv-hrem-const/Android.bp

diff --git a/test/411-checker-hdiv-hrem-const/Android.bp b/test/411-checker-hdiv-hrem-const/Android.bp
index b527c35..b10f824 100644
--- a/test/411-checker-hdiv-hrem-const/Android.bp
+++ b/test/411-checker-hdiv-hrem-const/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-411-checker-hdiv-hrem-const-expected"],
+    data: [":art-run-test-411-checker-hdiv-hrem-const-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-411-checker-hdiv-hrem-const-expected",
-    out: ["art-run-test-411-checker-hdiv-hrem-const-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-411-checker-hdiv-hrem-const-expected-stdout",
+    out: ["art-run-test-411-checker-hdiv-hrem-const-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/411-checker-hdiv-hrem-const/expected-stdout.txt

diff --git a/test/411-checker-hdiv-hrem-const/expected.txt b/test/411-checker-hdiv-hrem-const/expected-stdout.txt
similarity index 100%
rename from test/411-checker-hdiv-hrem-const/expected.txt
rename to test/411-checker-hdiv-hrem-const/expected-stdout.txt

test/411-checker-hdiv-hrem-pow2/Android.bp

diff --git a/test/411-checker-hdiv-hrem-pow2/Android.bp b/test/411-checker-hdiv-hrem-pow2/Android.bp
index 5dc3f09..c67375c 100644
--- a/test/411-checker-hdiv-hrem-pow2/Android.bp
+++ b/test/411-checker-hdiv-hrem-pow2/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-411-checker-hdiv-hrem-pow2-expected"],
+    data: [":art-run-test-411-checker-hdiv-hrem-pow2-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-411-checker-hdiv-hrem-pow2-expected",
-    out: ["art-run-test-411-checker-hdiv-hrem-pow2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-411-checker-hdiv-hrem-pow2-expected-stdout",
+    out: ["art-run-test-411-checker-hdiv-hrem-pow2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/411-checker-hdiv-hrem-pow2/expected-stdout.txt

diff --git a/test/411-checker-hdiv-hrem-pow2/expected.txt b/test/411-checker-hdiv-hrem-pow2/expected-stdout.txt
similarity index 100%
rename from test/411-checker-hdiv-hrem-pow2/expected.txt
rename to test/411-checker-hdiv-hrem-pow2/expected-stdout.txt

test/411-checker-instruct-simplifier-hrem/Android.bp

diff --git a/test/411-checker-instruct-simplifier-hrem/Android.bp b/test/411-checker-instruct-simplifier-hrem/Android.bp
index 6268107..57be3f9 100644
--- a/test/411-checker-instruct-simplifier-hrem/Android.bp
+++ b/test/411-checker-instruct-simplifier-hrem/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-411-checker-instruct-simplifier-hrem-expected"],
+    data: [":art-run-test-411-checker-instruct-simplifier-hrem-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-411-checker-instruct-simplifier-hrem-expected",
-    out: ["art-run-test-411-checker-instruct-simplifier-hrem-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-411-checker-instruct-simplifier-hrem-expected-stdout",
+    out: ["art-run-test-411-checker-instruct-simplifier-hrem-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/411-checker-instruct-simplifier-hrem/expected-stdout.txt

diff --git a/test/411-checker-instruct-simplifier-hrem/expected.txt b/test/411-checker-instruct-simplifier-hrem/expected-stdout.txt
similarity index 100%
rename from test/411-checker-instruct-simplifier-hrem/expected.txt
rename to test/411-checker-instruct-simplifier-hrem/expected-stdout.txt

test/411-optimizing-arith/Android.bp

diff --git a/test/411-optimizing-arith/Android.bp b/test/411-optimizing-arith/Android.bp
index ab74289..a2402f5 100644
--- a/test/411-optimizing-arith/Android.bp
+++ b/test/411-optimizing-arith/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-411-optimizing-arith-expected"],
+    data: [":art-run-test-411-optimizing-arith-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-411-optimizing-arith-expected",
-    out: ["art-run-test-411-optimizing-arith-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-411-optimizing-arith-expected-stdout",
+    out: ["art-run-test-411-optimizing-arith-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/411-optimizing-arith/expected-stdout.txt

diff --git a/test/411-optimizing-arith/expected.txt b/test/411-optimizing-arith/expected-stdout.txt
similarity index 100%
rename from test/411-optimizing-arith/expected.txt
rename to test/411-optimizing-arith/expected-stdout.txt

test/412-new-array/expected-stdout.txt

diff --git a/test/412-new-array/expected.txt b/test/412-new-array/expected-stdout.txt
similarity index 100%
rename from test/412-new-array/expected.txt
rename to test/412-new-array/expected-stdout.txt

test/413-regalloc-regression/Android.bp

diff --git a/test/413-regalloc-regression/Android.bp b/test/413-regalloc-regression/Android.bp
index b03afd8..159519b 100644
--- a/test/413-regalloc-regression/Android.bp
+++ b/test/413-regalloc-regression/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-413-regalloc-regression-expected"],
+    data: [":art-run-test-413-regalloc-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-413-regalloc-regression-expected",
-    out: ["art-run-test-413-regalloc-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-413-regalloc-regression-expected-stdout",
+    out: ["art-run-test-413-regalloc-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/413-regalloc-regression/expected-stdout.txt

diff --git a/test/413-regalloc-regression/expected.txt b/test/413-regalloc-regression/expected-stdout.txt
similarity index 100%
rename from test/413-regalloc-regression/expected.txt
rename to test/413-regalloc-regression/expected-stdout.txt

test/414-static-fields/Android.bp

diff --git a/test/414-static-fields/Android.bp b/test/414-static-fields/Android.bp
index 5ae7f5b..1de8ec1 100644
--- a/test/414-static-fields/Android.bp
+++ b/test/414-static-fields/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-414-static-fields-expected"],
+    data: [":art-run-test-414-static-fields-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-414-static-fields-expected",
-    out: ["art-run-test-414-static-fields-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-414-static-fields-expected-stdout",
+    out: ["art-run-test-414-static-fields-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/414-static-fields/expected-stdout.txt

diff --git a/test/414-static-fields/expected.txt b/test/414-static-fields/expected-stdout.txt
similarity index 100%
rename from test/414-static-fields/expected.txt
rename to test/414-static-fields/expected-stdout.txt

test/416-optimizing-arith-not/expected-stdout.txt

diff --git a/test/416-optimizing-arith-not/expected.txt b/test/416-optimizing-arith-not/expected-stdout.txt
similarity index 100%
rename from test/416-optimizing-arith-not/expected.txt
rename to test/416-optimizing-arith-not/expected-stdout.txt

test/418-const-string/Android.bp

diff --git a/test/418-const-string/Android.bp b/test/418-const-string/Android.bp
index 6dc2067..6078a44 100644
--- a/test/418-const-string/Android.bp
+++ b/test/418-const-string/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-418-const-string-expected"],
+    data: [":art-run-test-418-const-string-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-418-const-string-expected",
-    out: ["art-run-test-418-const-string-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-418-const-string-expected-stdout",
+    out: ["art-run-test-418-const-string-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/418-const-string/expected-stdout.txt

diff --git a/test/418-const-string/expected.txt b/test/418-const-string/expected-stdout.txt
similarity index 100%
rename from test/418-const-string/expected.txt
rename to test/418-const-string/expected-stdout.txt

test/419-long-parameter/Android.bp

diff --git a/test/419-long-parameter/Android.bp b/test/419-long-parameter/Android.bp
index 90f1fc2..694b09e 100644
--- a/test/419-long-parameter/Android.bp
+++ b/test/419-long-parameter/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-419-long-parameter-expected"],
+    data: [":art-run-test-419-long-parameter-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-419-long-parameter-expected",
-    out: ["art-run-test-419-long-parameter-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-419-long-parameter-expected-stdout",
+    out: ["art-run-test-419-long-parameter-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/419-long-parameter/expected-stdout.txt

diff --git a/test/419-long-parameter/expected.txt b/test/419-long-parameter/expected-stdout.txt
similarity index 100%
rename from test/419-long-parameter/expected.txt
rename to test/419-long-parameter/expected-stdout.txt

test/420-const-class/Android.bp

diff --git a/test/420-const-class/Android.bp b/test/420-const-class/Android.bp
index 8c08f06..25864df 100644
--- a/test/420-const-class/Android.bp
+++ b/test/420-const-class/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-420-const-class-expected"],
+    data: [":art-run-test-420-const-class-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-420-const-class-expected",
-    out: ["art-run-test-420-const-class-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-420-const-class-expected-stdout",
+    out: ["art-run-test-420-const-class-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/420-const-class/expected-stdout.txt

diff --git a/test/420-const-class/expected.txt b/test/420-const-class/expected-stdout.txt
similarity index 100%
rename from test/420-const-class/expected.txt
rename to test/420-const-class/expected-stdout.txt

test/421-exceptions/Android.bp

diff --git a/test/421-exceptions/Android.bp b/test/421-exceptions/Android.bp
index 1313ad5..6bb4c84 100644
--- a/test/421-exceptions/Android.bp
+++ b/test/421-exceptions/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-421-exceptions-expected"],
+    data: [":art-run-test-421-exceptions-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-421-exceptions-expected",
-    out: ["art-run-test-421-exceptions-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-421-exceptions-expected-stdout",
+    out: ["art-run-test-421-exceptions-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/421-exceptions/expected-stdout.txt

diff --git a/test/421-exceptions/expected.txt b/test/421-exceptions/expected-stdout.txt
similarity index 100%
rename from test/421-exceptions/expected.txt
rename to test/421-exceptions/expected-stdout.txt

test/421-large-frame/Android.bp

diff --git a/test/421-large-frame/Android.bp b/test/421-large-frame/Android.bp
index f51a0b1..6cc678e 100644
--- a/test/421-large-frame/Android.bp
+++ b/test/421-large-frame/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-421-large-frame-expected"],
+    data: [":art-run-test-421-large-frame-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-421-large-frame-expected",
-    out: ["art-run-test-421-large-frame-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-421-large-frame-expected-stdout",
+    out: ["art-run-test-421-large-frame-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/421-large-frame/expected-stdout.txt

diff --git a/test/421-large-frame/expected.txt b/test/421-large-frame/expected-stdout.txt
similarity index 100%
rename from test/421-large-frame/expected.txt
rename to test/421-large-frame/expected-stdout.txt

test/422-instanceof/Android.bp

diff --git a/test/422-instanceof/Android.bp b/test/422-instanceof/Android.bp
index e354869..9e1da09 100644
--- a/test/422-instanceof/Android.bp
+++ b/test/422-instanceof/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-422-instanceof-expected"],
+    data: [":art-run-test-422-instanceof-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-422-instanceof-expected",
-    out: ["art-run-test-422-instanceof-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-422-instanceof-expected-stdout",
+    out: ["art-run-test-422-instanceof-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/422-instanceof/expected-stdout.txt

diff --git a/test/422-instanceof/expected.txt b/test/422-instanceof/expected-stdout.txt
similarity index 100%
rename from test/422-instanceof/expected.txt
rename to test/422-instanceof/expected-stdout.txt

test/422-type-conversion/Android.bp

diff --git a/test/422-type-conversion/Android.bp b/test/422-type-conversion/Android.bp
index 5c5468c..256845b 100644
--- a/test/422-type-conversion/Android.bp
+++ b/test/422-type-conversion/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-422-type-conversion-expected"],
+    data: [":art-run-test-422-type-conversion-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-422-type-conversion-expected",
-    out: ["art-run-test-422-type-conversion-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-422-type-conversion-expected-stdout",
+    out: ["art-run-test-422-type-conversion-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/422-type-conversion/expected-stdout.txt

diff --git a/test/422-type-conversion/expected.txt b/test/422-type-conversion/expected-stdout.txt
similarity index 100%
rename from test/422-type-conversion/expected.txt
rename to test/422-type-conversion/expected-stdout.txt

test/423-invoke-interface/Android.bp

diff --git a/test/423-invoke-interface/Android.bp b/test/423-invoke-interface/Android.bp
index ed88de5..404d530 100644
--- a/test/423-invoke-interface/Android.bp
+++ b/test/423-invoke-interface/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-423-invoke-interface-expected"],
+    data: [":art-run-test-423-invoke-interface-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-423-invoke-interface-expected",
-    out: ["art-run-test-423-invoke-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-423-invoke-interface-expected-stdout",
+    out: ["art-run-test-423-invoke-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/423-invoke-interface/expected-stdout.txt

diff --git a/test/423-invoke-interface/expected.txt b/test/423-invoke-interface/expected-stdout.txt
similarity index 100%
rename from test/423-invoke-interface/expected.txt
rename to test/423-invoke-interface/expected-stdout.txt

test/424-checkcast/Android.bp

diff --git a/test/424-checkcast/Android.bp b/test/424-checkcast/Android.bp
index 167ef90..b6cfd5f 100644
--- a/test/424-checkcast/Android.bp
+++ b/test/424-checkcast/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-424-checkcast-expected"],
+    data: [":art-run-test-424-checkcast-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-424-checkcast-expected",
-    out: ["art-run-test-424-checkcast-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-424-checkcast-expected-stdout",
+    out: ["art-run-test-424-checkcast-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/424-checkcast/expected-stdout.txt

diff --git a/test/424-checkcast/expected.txt b/test/424-checkcast/expected-stdout.txt
similarity index 100%
rename from test/424-checkcast/expected.txt
rename to test/424-checkcast/expected-stdout.txt

test/425-invoke-super/expected-stdout.txt

diff --git a/test/425-invoke-super/expected.txt b/test/425-invoke-super/expected-stdout.txt
similarity index 100%
rename from test/425-invoke-super/expected.txt
rename to test/425-invoke-super/expected-stdout.txt

test/426-monitor/Android.bp

diff --git a/test/426-monitor/Android.bp b/test/426-monitor/Android.bp
index 587f407..82eb2fb 100644
--- a/test/426-monitor/Android.bp
+++ b/test/426-monitor/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-426-monitor-expected"],
+    data: [":art-run-test-426-monitor-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-426-monitor-expected",
-    out: ["art-run-test-426-monitor-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-426-monitor-expected-stdout",
+    out: ["art-run-test-426-monitor-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/426-monitor/expected-stdout.txt

diff --git a/test/426-monitor/expected.txt b/test/426-monitor/expected-stdout.txt
similarity index 100%
rename from test/426-monitor/expected.txt
rename to test/426-monitor/expected-stdout.txt

test/427-bitwise/Android.bp

diff --git a/test/427-bitwise/Android.bp b/test/427-bitwise/Android.bp
index c2c4578..c619fab 100644
--- a/test/427-bitwise/Android.bp
+++ b/test/427-bitwise/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-427-bitwise-expected"],
+    data: [":art-run-test-427-bitwise-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-427-bitwise-expected",
-    out: ["art-run-test-427-bitwise-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-427-bitwise-expected-stdout",
+    out: ["art-run-test-427-bitwise-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/427-bitwise/expected-stdout.txt

diff --git a/test/427-bitwise/expected.txt b/test/427-bitwise/expected-stdout.txt
similarity index 100%
rename from test/427-bitwise/expected.txt
rename to test/427-bitwise/expected-stdout.txt

test/427-bounds/Android.bp

diff --git a/test/427-bounds/Android.bp b/test/427-bounds/Android.bp
index 01d4feb..62237be 100644
--- a/test/427-bounds/Android.bp
+++ b/test/427-bounds/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-427-bounds-expected"],
+    data: [":art-run-test-427-bounds-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-427-bounds-expected",
-    out: ["art-run-test-427-bounds-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-427-bounds-expected-stdout",
+    out: ["art-run-test-427-bounds-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/427-bounds/expected-stdout.txt

diff --git a/test/427-bounds/expected.txt b/test/427-bounds/expected-stdout.txt
similarity index 100%
rename from test/427-bounds/expected.txt
rename to test/427-bounds/expected-stdout.txt

test/429-ssa-builder/Android.bp

diff --git a/test/429-ssa-builder/Android.bp b/test/429-ssa-builder/Android.bp
index ce18142..2956222 100644
--- a/test/429-ssa-builder/Android.bp
+++ b/test/429-ssa-builder/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-429-ssa-builder-expected"],
+    data: [":art-run-test-429-ssa-builder-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-429-ssa-builder-expected",
-    out: ["art-run-test-429-ssa-builder-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-429-ssa-builder-expected-stdout",
+    out: ["art-run-test-429-ssa-builder-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/429-ssa-builder/expected-stdout.txt

diff --git a/test/429-ssa-builder/expected.txt b/test/429-ssa-builder/expected-stdout.txt
similarity index 100%
rename from test/429-ssa-builder/expected.txt
rename to test/429-ssa-builder/expected-stdout.txt

test/430-live-register-slow-path/Android.bp

diff --git a/test/430-live-register-slow-path/Android.bp b/test/430-live-register-slow-path/Android.bp
index 3220b48..697309c 100644
--- a/test/430-live-register-slow-path/Android.bp
+++ b/test/430-live-register-slow-path/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-430-live-register-slow-path-expected"],
+    data: [":art-run-test-430-live-register-slow-path-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-430-live-register-slow-path-expected",
-    out: ["art-run-test-430-live-register-slow-path-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-430-live-register-slow-path-expected-stdout",
+    out: ["art-run-test-430-live-register-slow-path-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/430-live-register-slow-path/expected-stdout.txt

diff --git a/test/430-live-register-slow-path/expected.txt b/test/430-live-register-slow-path/expected-stdout.txt
similarity index 100%
rename from test/430-live-register-slow-path/expected.txt
rename to test/430-live-register-slow-path/expected-stdout.txt

test/431-type-propagation/expected-stdout.txt

diff --git a/test/431-type-propagation/expected.txt b/test/431-type-propagation/expected-stdout.txt
similarity index 100%
rename from test/431-type-propagation/expected.txt
rename to test/431-type-propagation/expected-stdout.txt

test/432-optimizing-cmp/expected-stdout.txt

diff --git a/test/432-optimizing-cmp/expected.txt b/test/432-optimizing-cmp/expected-stdout.txt
similarity index 100%
rename from test/432-optimizing-cmp/expected.txt
rename to test/432-optimizing-cmp/expected-stdout.txt

test/433-gvn/Android.bp

diff --git a/test/433-gvn/Android.bp b/test/433-gvn/Android.bp
index 1cd7242..926498c 100644
--- a/test/433-gvn/Android.bp
+++ b/test/433-gvn/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-433-gvn-expected"],
+    data: [":art-run-test-433-gvn-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-433-gvn-expected",
-    out: ["art-run-test-433-gvn-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-433-gvn-expected-stdout",
+    out: ["art-run-test-433-gvn-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/433-gvn/expected-stdout.txt

diff --git a/test/433-gvn/expected.txt b/test/433-gvn/expected-stdout.txt
similarity index 100%
rename from test/433-gvn/expected.txt
rename to test/433-gvn/expected-stdout.txt

test/434-invoke-direct/expected-stdout.txt

diff --git a/test/434-invoke-direct/expected.txt b/test/434-invoke-direct/expected-stdout.txt
similarity index 100%
rename from test/434-invoke-direct/expected.txt
rename to test/434-invoke-direct/expected-stdout.txt

test/434-shifter-operand/Android.bp

diff --git a/test/434-shifter-operand/Android.bp b/test/434-shifter-operand/Android.bp
index 736a3c8..5473d82 100644
--- a/test/434-shifter-operand/Android.bp
+++ b/test/434-shifter-operand/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-434-shifter-operand-expected"],
+    data: [":art-run-test-434-shifter-operand-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-434-shifter-operand-expected",
-    out: ["art-run-test-434-shifter-operand-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-434-shifter-operand-expected-stdout",
+    out: ["art-run-test-434-shifter-operand-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/434-shifter-operand/expected-stdout.txt

diff --git a/test/434-shifter-operand/expected.txt b/test/434-shifter-operand/expected-stdout.txt
similarity index 100%
rename from test/434-shifter-operand/expected.txt
rename to test/434-shifter-operand/expected-stdout.txt

test/435-new-instance/expected-stdout.txt

diff --git a/test/435-new-instance/expected.txt b/test/435-new-instance/expected-stdout.txt
similarity index 100%
rename from test/435-new-instance/expected.txt
rename to test/435-new-instance/expected-stdout.txt

test/435-try-finally-without-catch/Android.bp

diff --git a/test/435-try-finally-without-catch/Android.bp b/test/435-try-finally-without-catch/Android.bp
index 1b1f8bc..6f2ad2f 100644
--- a/test/435-try-finally-without-catch/Android.bp
+++ b/test/435-try-finally-without-catch/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-435-try-finally-without-catch-expected"],
+    data: [":art-run-test-435-try-finally-without-catch-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-435-try-finally-without-catch-expected",
-    out: ["art-run-test-435-try-finally-without-catch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-435-try-finally-without-catch-expected-stdout",
+    out: ["art-run-test-435-try-finally-without-catch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/435-try-finally-without-catch/expected-stdout.txt

diff --git a/test/435-try-finally-without-catch/expected.txt b/test/435-try-finally-without-catch/expected-stdout.txt
similarity index 100%
rename from test/435-try-finally-without-catch/expected.txt
rename to test/435-try-finally-without-catch/expected-stdout.txt

test/436-rem-float/Android.bp

diff --git a/test/436-rem-float/Android.bp b/test/436-rem-float/Android.bp
index 1271417..febe50f 100644
--- a/test/436-rem-float/Android.bp
+++ b/test/436-rem-float/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-436-rem-float-expected"],
+    data: [":art-run-test-436-rem-float-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-436-rem-float-expected",
-    out: ["art-run-test-436-rem-float-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-436-rem-float-expected-stdout",
+    out: ["art-run-test-436-rem-float-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/436-rem-float/expected-stdout.txt

diff --git a/test/436-rem-float/expected.txt b/test/436-rem-float/expected-stdout.txt
similarity index 100%
rename from test/436-rem-float/expected.txt
rename to test/436-rem-float/expected-stdout.txt

test/436-shift-constant/Android.bp

diff --git a/test/436-shift-constant/Android.bp b/test/436-shift-constant/Android.bp
index a53ddc4..ef6f3d1 100644
--- a/test/436-shift-constant/Android.bp
+++ b/test/436-shift-constant/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-436-shift-constant-expected"],
+    data: [":art-run-test-436-shift-constant-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-436-shift-constant-expected",
-    out: ["art-run-test-436-shift-constant-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-436-shift-constant-expected-stdout",
+    out: ["art-run-test-436-shift-constant-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/436-shift-constant/expected-stdout.txt

diff --git a/test/436-shift-constant/expected.txt b/test/436-shift-constant/expected-stdout.txt
similarity index 100%
rename from test/436-shift-constant/expected.txt
rename to test/436-shift-constant/expected-stdout.txt

test/437-inline/Android.bp

diff --git a/test/437-inline/Android.bp b/test/437-inline/Android.bp
index 6d4079d..e4f02dc 100644
--- a/test/437-inline/Android.bp
+++ b/test/437-inline/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-437-inline-expected"],
+    data: [":art-run-test-437-inline-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-437-inline-expected",
-    out: ["art-run-test-437-inline-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-437-inline-expected-stdout",
+    out: ["art-run-test-437-inline-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/437-inline/expected-stdout.txt

diff --git a/test/437-inline/expected.txt b/test/437-inline/expected-stdout.txt
similarity index 100%
rename from test/437-inline/expected.txt
rename to test/437-inline/expected-stdout.txt

test/438-volatile/Android.bp

diff --git a/test/438-volatile/Android.bp b/test/438-volatile/Android.bp
index c87914d..94f5613 100644
--- a/test/438-volatile/Android.bp
+++ b/test/438-volatile/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-438-volatile-expected"],
+    data: [":art-run-test-438-volatile-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-438-volatile-expected",
-    out: ["art-run-test-438-volatile-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-438-volatile-expected-stdout",
+    out: ["art-run-test-438-volatile-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/438-volatile/expected-stdout.txt

diff --git a/test/438-volatile/expected.txt b/test/438-volatile/expected-stdout.txt
similarity index 100%
rename from test/438-volatile/expected.txt
rename to test/438-volatile/expected-stdout.txt

test/439-npe/Android.bp

diff --git a/test/439-npe/Android.bp b/test/439-npe/Android.bp
index a9402bd..317d247 100644
--- a/test/439-npe/Android.bp
+++ b/test/439-npe/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-439-npe-expected"],
+    data: [":art-run-test-439-npe-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-439-npe-expected",
-    out: ["art-run-test-439-npe-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-439-npe-expected-stdout",
+    out: ["art-run-test-439-npe-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/439-npe/expected-stdout.txt

diff --git a/test/439-npe/expected.txt b/test/439-npe/expected-stdout.txt
similarity index 100%
rename from test/439-npe/expected.txt
rename to test/439-npe/expected-stdout.txt

test/439-swap-double/Android.bp

diff --git a/test/439-swap-double/Android.bp b/test/439-swap-double/Android.bp
index c29d7f7..eba39a7 100644
--- a/test/439-swap-double/Android.bp
+++ b/test/439-swap-double/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-439-swap-double-expected"],
+    data: [":art-run-test-439-swap-double-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-439-swap-double-expected",
-    out: ["art-run-test-439-swap-double-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-439-swap-double-expected-stdout",
+    out: ["art-run-test-439-swap-double-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/439-swap-double/expected-stdout.txt

diff --git a/test/439-swap-double/expected.txt b/test/439-swap-double/expected-stdout.txt
similarity index 100%
rename from test/439-swap-double/expected.txt
rename to test/439-swap-double/expected-stdout.txt

test/440-stmp/Android.bp

diff --git a/test/440-stmp/Android.bp b/test/440-stmp/Android.bp
index d6316eb..895d211 100644
--- a/test/440-stmp/Android.bp
+++ b/test/440-stmp/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-440-stmp-expected"],
+    data: [":art-run-test-440-stmp-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-440-stmp-expected",
-    out: ["art-run-test-440-stmp-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-440-stmp-expected-stdout",
+    out: ["art-run-test-440-stmp-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/440-stmp/expected-stdout.txt

diff --git a/test/440-stmp/expected.txt b/test/440-stmp/expected-stdout.txt
similarity index 100%
rename from test/440-stmp/expected.txt
rename to test/440-stmp/expected-stdout.txt

test/441-checker-inliner/Android.bp

diff --git a/test/441-checker-inliner/Android.bp b/test/441-checker-inliner/Android.bp
index 867399d..1bf981d 100644
--- a/test/441-checker-inliner/Android.bp
+++ b/test/441-checker-inliner/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-441-checker-inliner-expected"],
+    data: [":art-run-test-441-checker-inliner-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-441-checker-inliner-expected",
-    out: ["art-run-test-441-checker-inliner-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-441-checker-inliner-expected-stdout",
+    out: ["art-run-test-441-checker-inliner-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/441-checker-inliner/expected-stdout.txt

diff --git a/test/441-checker-inliner/expected.txt b/test/441-checker-inliner/expected-stdout.txt
similarity index 100%
rename from test/441-checker-inliner/expected.txt
rename to test/441-checker-inliner/expected-stdout.txt

test/442-checker-constant-folding/expected-stdout.txt

diff --git a/test/442-checker-constant-folding/expected.txt b/test/442-checker-constant-folding/expected-stdout.txt
similarity index 100%
rename from test/442-checker-constant-folding/expected.txt
rename to test/442-checker-constant-folding/expected-stdout.txt

test/443-not-bool-inline/Android.bp

diff --git a/test/443-not-bool-inline/Android.bp b/test/443-not-bool-inline/Android.bp
index f6e8e9b..b5174d4 100644
--- a/test/443-not-bool-inline/Android.bp
+++ b/test/443-not-bool-inline/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-443-not-bool-inline-expected"],
+    data: [":art-run-test-443-not-bool-inline-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-443-not-bool-inline-expected",
-    out: ["art-run-test-443-not-bool-inline-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-443-not-bool-inline-expected-stdout",
+    out: ["art-run-test-443-not-bool-inline-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/443-not-bool-inline/expected-stdout.txt

diff --git a/test/443-not-bool-inline/expected.txt b/test/443-not-bool-inline/expected-stdout.txt
similarity index 100%
rename from test/443-not-bool-inline/expected.txt
rename to test/443-not-bool-inline/expected-stdout.txt

test/444-checker-nce/Android.bp

diff --git a/test/444-checker-nce/Android.bp b/test/444-checker-nce/Android.bp
index 30aed54..dac7527 100644
--- a/test/444-checker-nce/Android.bp
+++ b/test/444-checker-nce/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-444-checker-nce-expected"],
+    data: [":art-run-test-444-checker-nce-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-444-checker-nce-expected",
-    out: ["art-run-test-444-checker-nce-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-444-checker-nce-expected-stdout",
+    out: ["art-run-test-444-checker-nce-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/444-checker-nce/expected-stdout.txt

diff --git a/test/444-checker-nce/expected.txt b/test/444-checker-nce/expected-stdout.txt
similarity index 100%
rename from test/444-checker-nce/expected.txt
rename to test/444-checker-nce/expected-stdout.txt

test/445-checker-licm/Android.bp

diff --git a/test/445-checker-licm/Android.bp b/test/445-checker-licm/Android.bp
index c113483..7e704a9 100644
--- a/test/445-checker-licm/Android.bp
+++ b/test/445-checker-licm/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-445-checker-licm-expected"],
+    data: [":art-run-test-445-checker-licm-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-445-checker-licm-expected",
-    out: ["art-run-test-445-checker-licm-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-445-checker-licm-expected-stdout",
+    out: ["art-run-test-445-checker-licm-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/445-checker-licm/expected-stdout.txt

diff --git a/test/445-checker-licm/expected.txt b/test/445-checker-licm/expected-stdout.txt
similarity index 100%
rename from test/445-checker-licm/expected.txt
rename to test/445-checker-licm/expected-stdout.txt

test/446-checker-inliner2/Android.bp

diff --git a/test/446-checker-inliner2/Android.bp b/test/446-checker-inliner2/Android.bp
index cd2c5f6..de61507 100644
--- a/test/446-checker-inliner2/Android.bp
+++ b/test/446-checker-inliner2/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-446-checker-inliner2-expected"],
+    data: [":art-run-test-446-checker-inliner2-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-446-checker-inliner2-expected",
-    out: ["art-run-test-446-checker-inliner2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-446-checker-inliner2-expected-stdout",
+    out: ["art-run-test-446-checker-inliner2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/446-checker-inliner2/expected-stdout.txt

diff --git a/test/446-checker-inliner2/expected.txt b/test/446-checker-inliner2/expected-stdout.txt
similarity index 100%
rename from test/446-checker-inliner2/expected.txt
rename to test/446-checker-inliner2/expected-stdout.txt

test/447-checker-inliner3/Android.bp

diff --git a/test/447-checker-inliner3/Android.bp b/test/447-checker-inliner3/Android.bp
index 7ff8f72..664cdae 100644
--- a/test/447-checker-inliner3/Android.bp
+++ b/test/447-checker-inliner3/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-447-checker-inliner3-expected"],
+    data: [":art-run-test-447-checker-inliner3-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-447-checker-inliner3-expected",
-    out: ["art-run-test-447-checker-inliner3-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-447-checker-inliner3-expected-stdout",
+    out: ["art-run-test-447-checker-inliner3-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/447-checker-inliner3/expected-stdout.txt

diff --git a/test/447-checker-inliner3/expected.txt b/test/447-checker-inliner3/expected-stdout.txt
similarity index 100%
rename from test/447-checker-inliner3/expected.txt
rename to test/447-checker-inliner3/expected-stdout.txt

test/448-multiple-returns/expected-stdout.txt

diff --git a/test/448-multiple-returns/expected.txt b/test/448-multiple-returns/expected-stdout.txt
similarity index 100%
rename from test/448-multiple-returns/expected.txt
rename to test/448-multiple-returns/expected-stdout.txt

test/449-checker-bce-rem/Android.bp

diff --git a/test/449-checker-bce-rem/Android.bp b/test/449-checker-bce-rem/Android.bp
index b1a7aa7..472c7c9 100644
--- a/test/449-checker-bce-rem/Android.bp
+++ b/test/449-checker-bce-rem/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-449-checker-bce-rem-expected"],
+    data: [":art-run-test-449-checker-bce-rem-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-449-checker-bce-rem-expected",
-    out: ["art-run-test-449-checker-bce-rem-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-449-checker-bce-rem-expected-stdout",
+    out: ["art-run-test-449-checker-bce-rem-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/449-checker-bce-rem/expected-stdout.txt

diff --git a/test/449-checker-bce-rem/expected.txt b/test/449-checker-bce-rem/expected-stdout.txt
similarity index 100%
rename from test/449-checker-bce-rem/expected.txt
rename to test/449-checker-bce-rem/expected-stdout.txt

test/449-checker-bce/Android.bp

diff --git a/test/449-checker-bce/Android.bp b/test/449-checker-bce/Android.bp
index 7c48bbc..1cbd303 100644
--- a/test/449-checker-bce/Android.bp
+++ b/test/449-checker-bce/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-449-checker-bce-expected"],
+    data: [":art-run-test-449-checker-bce-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-449-checker-bce-expected",
-    out: ["art-run-test-449-checker-bce-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-449-checker-bce-expected-stdout",
+    out: ["art-run-test-449-checker-bce-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/449-checker-bce/expected-stdout.txt

diff --git a/test/449-checker-bce/expected.txt b/test/449-checker-bce/expected-stdout.txt
similarity index 100%
rename from test/449-checker-bce/expected.txt
rename to test/449-checker-bce/expected-stdout.txt

test/450-checker-types/Android.bp

diff --git a/test/450-checker-types/Android.bp b/test/450-checker-types/Android.bp
index ff1bb3b..2ac311b 100644
--- a/test/450-checker-types/Android.bp
+++ b/test/450-checker-types/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-450-checker-types-expected"],
+    data: [":art-run-test-450-checker-types-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-450-checker-types-expected",
-    out: ["art-run-test-450-checker-types-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-450-checker-types-expected-stdout",
+    out: ["art-run-test-450-checker-types-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/450-checker-types/expected-stdout.txt

diff --git a/test/450-checker-types/expected.txt b/test/450-checker-types/expected-stdout.txt
similarity index 100%
rename from test/450-checker-types/expected.txt
rename to test/450-checker-types/expected-stdout.txt

test/451-regression-add-float/Android.bp

diff --git a/test/451-regression-add-float/Android.bp b/test/451-regression-add-float/Android.bp
index ddf7285..9b0fa84 100644
--- a/test/451-regression-add-float/Android.bp
+++ b/test/451-regression-add-float/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-451-regression-add-float-expected"],
+    data: [":art-run-test-451-regression-add-float-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-451-regression-add-float-expected",
-    out: ["art-run-test-451-regression-add-float-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-451-regression-add-float-expected-stdout",
+    out: ["art-run-test-451-regression-add-float-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/451-regression-add-float/expected-stdout.txt

diff --git a/test/451-regression-add-float/expected.txt b/test/451-regression-add-float/expected-stdout.txt
similarity index 100%
rename from test/451-regression-add-float/expected.txt
rename to test/451-regression-add-float/expected-stdout.txt

test/451-spill-splot/Android.bp

diff --git a/test/451-spill-splot/Android.bp b/test/451-spill-splot/Android.bp
index b4e33a2..2207e61 100644
--- a/test/451-spill-splot/Android.bp
+++ b/test/451-spill-splot/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-451-spill-splot-expected"],
+    data: [":art-run-test-451-spill-splot-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-451-spill-splot-expected",
-    out: ["art-run-test-451-spill-splot-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-451-spill-splot-expected-stdout",
+    out: ["art-run-test-451-spill-splot-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/451-spill-splot/expected-stdout.txt

diff --git a/test/451-spill-splot/expected.txt b/test/451-spill-splot/expected-stdout.txt
similarity index 100%
rename from test/451-spill-splot/expected.txt
rename to test/451-spill-splot/expected-stdout.txt

test/452-multiple-returns2/expected-stdout.txt

diff --git a/test/452-multiple-returns2/expected.txt b/test/452-multiple-returns2/expected-stdout.txt
similarity index 100%
rename from test/452-multiple-returns2/expected.txt
rename to test/452-multiple-returns2/expected-stdout.txt

test/453-not-byte/expected-stdout.txt

diff --git a/test/453-not-byte/expected.txt b/test/453-not-byte/expected-stdout.txt
similarity index 100%
rename from test/453-not-byte/expected.txt
rename to test/453-not-byte/expected-stdout.txt

test/454-get-vreg/Android.bp

diff --git a/test/454-get-vreg/Android.bp b/test/454-get-vreg/Android.bp
index 08b8ee9..2202c14 100644
--- a/test/454-get-vreg/Android.bp
+++ b/test/454-get-vreg/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-454-get-vreg-expected"],
+    data: [":art-run-test-454-get-vreg-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-454-get-vreg-expected",
-    out: ["art-run-test-454-get-vreg-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-454-get-vreg-expected-stdout",
+    out: ["art-run-test-454-get-vreg-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/454-get-vreg/expected-stdout.txt

diff --git a/test/454-get-vreg/expected.txt b/test/454-get-vreg/expected-stdout.txt
similarity index 100%
rename from test/454-get-vreg/expected.txt
rename to test/454-get-vreg/expected-stdout.txt

test/455-checker-gvn/Android.bp

diff --git a/test/455-checker-gvn/Android.bp b/test/455-checker-gvn/Android.bp
index 7523c35..aa49882 100644
--- a/test/455-checker-gvn/Android.bp
+++ b/test/455-checker-gvn/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-455-checker-gvn-expected"],
+    data: [":art-run-test-455-checker-gvn-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-455-checker-gvn-expected",
-    out: ["art-run-test-455-checker-gvn-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-455-checker-gvn-expected-stdout",
+    out: ["art-run-test-455-checker-gvn-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/455-checker-gvn/expected-stdout.txt

diff --git a/test/455-checker-gvn/expected.txt b/test/455-checker-gvn/expected-stdout.txt
similarity index 100%
rename from test/455-checker-gvn/expected.txt
rename to test/455-checker-gvn/expected-stdout.txt

test/456-baseline-array-set/Android.bp

diff --git a/test/456-baseline-array-set/Android.bp b/test/456-baseline-array-set/Android.bp
index c348dde..a4e716e 100644
--- a/test/456-baseline-array-set/Android.bp
+++ b/test/456-baseline-array-set/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-456-baseline-array-set-expected"],
+    data: [":art-run-test-456-baseline-array-set-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-456-baseline-array-set-expected",
-    out: ["art-run-test-456-baseline-array-set-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-456-baseline-array-set-expected-stdout",
+    out: ["art-run-test-456-baseline-array-set-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/456-baseline-array-set/expected-stdout.txt

diff --git a/test/456-baseline-array-set/expected.txt b/test/456-baseline-array-set/expected-stdout.txt
similarity index 100%
rename from test/456-baseline-array-set/expected.txt
rename to test/456-baseline-array-set/expected-stdout.txt

test/457-regs/expected-stdout.txt

diff --git a/test/457-regs/expected.txt b/test/457-regs/expected-stdout.txt
similarity index 100%
rename from test/457-regs/expected.txt
rename to test/457-regs/expected-stdout.txt

test/458-checker-instruct-simplification/expected-stdout.txt

diff --git a/test/458-checker-instruct-simplification/expected.txt b/test/458-checker-instruct-simplification/expected-stdout.txt
similarity index 100%
rename from test/458-checker-instruct-simplification/expected.txt
rename to test/458-checker-instruct-simplification/expected-stdout.txt

test/458-long-to-fpu/Android.bp

diff --git a/test/458-long-to-fpu/Android.bp b/test/458-long-to-fpu/Android.bp
index 404a13c..0e158f5 100644
--- a/test/458-long-to-fpu/Android.bp
+++ b/test/458-long-to-fpu/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-458-long-to-fpu-expected"],
+    data: [":art-run-test-458-long-to-fpu-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-458-long-to-fpu-expected",
-    out: ["art-run-test-458-long-to-fpu-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-458-long-to-fpu-expected-stdout",
+    out: ["art-run-test-458-long-to-fpu-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/458-long-to-fpu/expected-stdout.txt

diff --git a/test/458-long-to-fpu/expected.txt b/test/458-long-to-fpu/expected-stdout.txt
similarity index 100%
rename from test/458-long-to-fpu/expected.txt
rename to test/458-long-to-fpu/expected-stdout.txt

test/459-dead-phi/expected-stdout.txt

diff --git a/test/459-dead-phi/expected.txt b/test/459-dead-phi/expected-stdout.txt
similarity index 100%
rename from test/459-dead-phi/expected.txt
rename to test/459-dead-phi/expected-stdout.txt

test/460-multiple-returns3/expected-stdout.txt

diff --git a/test/460-multiple-returns3/expected.txt b/test/460-multiple-returns3/expected-stdout.txt
similarity index 100%
rename from test/460-multiple-returns3/expected.txt
rename to test/460-multiple-returns3/expected-stdout.txt

test/461-get-reference-vreg/Android.bp

diff --git a/test/461-get-reference-vreg/Android.bp b/test/461-get-reference-vreg/Android.bp
index a43250f..87762cc 100644
--- a/test/461-get-reference-vreg/Android.bp
+++ b/test/461-get-reference-vreg/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-461-get-reference-vreg-expected"],
+    data: [":art-run-test-461-get-reference-vreg-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-461-get-reference-vreg-expected",
-    out: ["art-run-test-461-get-reference-vreg-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-461-get-reference-vreg-expected-stdout",
+    out: ["art-run-test-461-get-reference-vreg-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/461-get-reference-vreg/expected-stdout.txt

diff --git a/test/461-get-reference-vreg/expected.txt b/test/461-get-reference-vreg/expected-stdout.txt
similarity index 100%
rename from test/461-get-reference-vreg/expected.txt
rename to test/461-get-reference-vreg/expected-stdout.txt

test/462-checker-inlining-dex-files/expected-stdout.txt

diff --git a/test/462-checker-inlining-dex-files/expected.txt b/test/462-checker-inlining-dex-files/expected-stdout.txt
similarity index 100%
rename from test/462-checker-inlining-dex-files/expected.txt
rename to test/462-checker-inlining-dex-files/expected-stdout.txt

test/463-checker-boolean-simplifier/expected-stdout.txt

diff --git a/test/463-checker-boolean-simplifier/expected.txt b/test/463-checker-boolean-simplifier/expected-stdout.txt
similarity index 100%
rename from test/463-checker-boolean-simplifier/expected.txt
rename to test/463-checker-boolean-simplifier/expected-stdout.txt

test/464-checker-inline-sharpen-calls/Android.bp

diff --git a/test/464-checker-inline-sharpen-calls/Android.bp b/test/464-checker-inline-sharpen-calls/Android.bp
index 1534453..80931f6 100644
--- a/test/464-checker-inline-sharpen-calls/Android.bp
+++ b/test/464-checker-inline-sharpen-calls/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-464-checker-inline-sharpen-calls-expected"],
+    data: [":art-run-test-464-checker-inline-sharpen-calls-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-464-checker-inline-sharpen-calls-expected",
-    out: ["art-run-test-464-checker-inline-sharpen-calls-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-464-checker-inline-sharpen-calls-expected-stdout",
+    out: ["art-run-test-464-checker-inline-sharpen-calls-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/464-checker-inline-sharpen-calls/expected-stdout.txt

diff --git a/test/464-checker-inline-sharpen-calls/expected.txt b/test/464-checker-inline-sharpen-calls/expected-stdout.txt
similarity index 100%
rename from test/464-checker-inline-sharpen-calls/expected.txt
rename to test/464-checker-inline-sharpen-calls/expected-stdout.txt

test/465-checker-clinit-gvn/Android.bp

diff --git a/test/465-checker-clinit-gvn/Android.bp b/test/465-checker-clinit-gvn/Android.bp
index bc97e6a..3aadfe8 100644
--- a/test/465-checker-clinit-gvn/Android.bp
+++ b/test/465-checker-clinit-gvn/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-465-checker-clinit-gvn-expected"],
+    data: [":art-run-test-465-checker-clinit-gvn-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-465-checker-clinit-gvn-expected",
-    out: ["art-run-test-465-checker-clinit-gvn-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-465-checker-clinit-gvn-expected-stdout",
+    out: ["art-run-test-465-checker-clinit-gvn-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/465-checker-clinit-gvn/expected-stdout.txt

diff --git a/test/465-checker-clinit-gvn/expected.txt b/test/465-checker-clinit-gvn/expected-stdout.txt
similarity index 100%
rename from test/465-checker-clinit-gvn/expected.txt
rename to test/465-checker-clinit-gvn/expected-stdout.txt

test/466-get-live-vreg/Android.bp

diff --git a/test/466-get-live-vreg/Android.bp b/test/466-get-live-vreg/Android.bp
index d9fd66a..8d1ec30 100644
--- a/test/466-get-live-vreg/Android.bp
+++ b/test/466-get-live-vreg/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-466-get-live-vreg-expected"],
+    data: [":art-run-test-466-get-live-vreg-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-466-get-live-vreg-expected",
-    out: ["art-run-test-466-get-live-vreg-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-466-get-live-vreg-expected-stdout",
+    out: ["art-run-test-466-get-live-vreg-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/466-get-live-vreg/expected-stdout.txt

diff --git a/test/466-get-live-vreg/expected.txt b/test/466-get-live-vreg/expected-stdout.txt
similarity index 100%
rename from test/466-get-live-vreg/expected.txt
rename to test/466-get-live-vreg/expected-stdout.txt

test/467-regalloc-pair/expected-stdout.txt

diff --git a/test/467-regalloc-pair/expected.txt b/test/467-regalloc-pair/expected-stdout.txt
similarity index 100%
rename from test/467-regalloc-pair/expected.txt
rename to test/467-regalloc-pair/expected-stdout.txt

test/468-checker-bool-simplif-regression/expected-stdout.txt

diff --git a/test/468-checker-bool-simplif-regression/expected.txt b/test/468-checker-bool-simplif-regression/expected-stdout.txt
similarity index 100%
rename from test/468-checker-bool-simplif-regression/expected.txt
rename to test/468-checker-bool-simplif-regression/expected-stdout.txt

test/469-condition-materialization/Android.bp

diff --git a/test/469-condition-materialization/Android.bp b/test/469-condition-materialization/Android.bp
index 3d3926e..b2c551e 100644
--- a/test/469-condition-materialization/Android.bp
+++ b/test/469-condition-materialization/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-469-condition-materialization-expected"],
+    data: [":art-run-test-469-condition-materialization-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-469-condition-materialization-expected",
-    out: ["art-run-test-469-condition-materialization-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-469-condition-materialization-expected-stdout",
+    out: ["art-run-test-469-condition-materialization-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/469-condition-materialization/expected-stdout.txt

diff --git a/test/469-condition-materialization/expected.txt b/test/469-condition-materialization/expected-stdout.txt
similarity index 100%
rename from test/469-condition-materialization/expected.txt
rename to test/469-condition-materialization/expected-stdout.txt

test/470-huge-method/Android.bp

diff --git a/test/470-huge-method/Android.bp b/test/470-huge-method/Android.bp
index e077583..a35b641 100644
--- a/test/470-huge-method/Android.bp
+++ b/test/470-huge-method/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-470-huge-method-expected"],
+    data: [":art-run-test-470-huge-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-470-huge-method-expected",
-    out: ["art-run-test-470-huge-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-470-huge-method-expected-stdout",
+    out: ["art-run-test-470-huge-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/470-huge-method/expected-stdout.txt

diff --git a/test/470-huge-method/expected.txt b/test/470-huge-method/expected-stdout.txt
similarity index 100%
rename from test/470-huge-method/expected.txt
rename to test/470-huge-method/expected-stdout.txt

test/471-deopt-environment/Android.bp

diff --git a/test/471-deopt-environment/Android.bp b/test/471-deopt-environment/Android.bp
index 7fa8c36..21e64bb 100644
--- a/test/471-deopt-environment/Android.bp
+++ b/test/471-deopt-environment/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-471-deopt-environment-expected"],
+    data: [":art-run-test-471-deopt-environment-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-471-deopt-environment-expected",
-    out: ["art-run-test-471-deopt-environment-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-471-deopt-environment-expected-stdout",
+    out: ["art-run-test-471-deopt-environment-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/471-deopt-environment/expected-stdout.txt

diff --git a/test/471-deopt-environment/expected.txt b/test/471-deopt-environment/expected-stdout.txt
similarity index 100%
rename from test/471-deopt-environment/expected.txt
rename to test/471-deopt-environment/expected-stdout.txt

test/471-uninitialized-locals/expected-stdout.txt

diff --git a/test/471-uninitialized-locals/expected.txt b/test/471-uninitialized-locals/expected-stdout.txt
similarity index 100%
rename from test/471-uninitialized-locals/expected.txt
rename to test/471-uninitialized-locals/expected-stdout.txt

test/472-type-propagation/Android.bp

diff --git a/test/472-type-propagation/Android.bp b/test/472-type-propagation/Android.bp
index 7b7e195..bd716e7 100644
--- a/test/472-type-propagation/Android.bp
+++ b/test/472-type-propagation/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-472-type-propagation-expected"],
+    data: [":art-run-test-472-type-propagation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-472-type-propagation-expected",
-    out: ["art-run-test-472-type-propagation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-472-type-propagation-expected-stdout",
+    out: ["art-run-test-472-type-propagation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/472-type-propagation/expected-stdout.txt

diff --git a/test/472-type-propagation/expected.txt b/test/472-type-propagation/expected-stdout.txt
similarity index 100%
rename from test/472-type-propagation/expected.txt
rename to test/472-type-propagation/expected-stdout.txt

test/472-unreachable-if-regression/expected-stdout.txt

diff --git a/test/472-unreachable-if-regression/expected.txt b/test/472-unreachable-if-regression/expected-stdout.txt
similarity index 100%
rename from test/472-unreachable-if-regression/expected.txt
rename to test/472-unreachable-if-regression/expected-stdout.txt

test/473-checker-inliner-constants/Android.bp

diff --git a/test/473-checker-inliner-constants/Android.bp b/test/473-checker-inliner-constants/Android.bp
index d9403ff..6bf8d36 100644
--- a/test/473-checker-inliner-constants/Android.bp
+++ b/test/473-checker-inliner-constants/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-473-checker-inliner-constants-expected"],
+    data: [":art-run-test-473-checker-inliner-constants-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-473-checker-inliner-constants-expected",
-    out: ["art-run-test-473-checker-inliner-constants-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-473-checker-inliner-constants-expected-stdout",
+    out: ["art-run-test-473-checker-inliner-constants-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/473-checker-inliner-constants/expected-stdout.txt

diff --git a/test/473-checker-inliner-constants/expected.txt b/test/473-checker-inliner-constants/expected-stdout.txt
similarity index 100%
rename from test/473-checker-inliner-constants/expected.txt
rename to test/473-checker-inliner-constants/expected-stdout.txt

test/473-remove-dead-block/Android.bp

diff --git a/test/473-remove-dead-block/Android.bp b/test/473-remove-dead-block/Android.bp
index 1fb3d98..8c6ab71 100644
--- a/test/473-remove-dead-block/Android.bp
+++ b/test/473-remove-dead-block/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-473-remove-dead-block-expected"],
+    data: [":art-run-test-473-remove-dead-block-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-473-remove-dead-block-expected",
-    out: ["art-run-test-473-remove-dead-block-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-473-remove-dead-block-expected-stdout",
+    out: ["art-run-test-473-remove-dead-block-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/473-remove-dead-block/expected-stdout.txt

diff --git a/test/473-remove-dead-block/expected.txt b/test/473-remove-dead-block/expected-stdout.txt
similarity index 100%
rename from test/473-remove-dead-block/expected.txt
rename to test/473-remove-dead-block/expected-stdout.txt

test/474-checker-boolean-input/Android.bp

diff --git a/test/474-checker-boolean-input/Android.bp b/test/474-checker-boolean-input/Android.bp
index 129f14d..ab7306c 100644
--- a/test/474-checker-boolean-input/Android.bp
+++ b/test/474-checker-boolean-input/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-474-checker-boolean-input-expected"],
+    data: [":art-run-test-474-checker-boolean-input-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-474-checker-boolean-input-expected",
-    out: ["art-run-test-474-checker-boolean-input-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-474-checker-boolean-input-expected-stdout",
+    out: ["art-run-test-474-checker-boolean-input-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/474-checker-boolean-input/expected-stdout.txt

diff --git a/test/474-checker-boolean-input/expected.txt b/test/474-checker-boolean-input/expected-stdout.txt
similarity index 100%
rename from test/474-checker-boolean-input/expected.txt
rename to test/474-checker-boolean-input/expected-stdout.txt

test/474-fp-sub-neg/Android.bp

diff --git a/test/474-fp-sub-neg/Android.bp b/test/474-fp-sub-neg/Android.bp
index 279d7aa..a3d236a 100644
--- a/test/474-fp-sub-neg/Android.bp
+++ b/test/474-fp-sub-neg/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-474-fp-sub-neg-expected"],
+    data: [":art-run-test-474-fp-sub-neg-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-474-fp-sub-neg-expected",
-    out: ["art-run-test-474-fp-sub-neg-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-474-fp-sub-neg-expected-stdout",
+    out: ["art-run-test-474-fp-sub-neg-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/474-fp-sub-neg/expected-stdout.txt

diff --git a/test/474-fp-sub-neg/expected.txt b/test/474-fp-sub-neg/expected-stdout.txt
similarity index 100%
rename from test/474-fp-sub-neg/expected.txt
rename to test/474-fp-sub-neg/expected-stdout.txt

test/475-regression-inliner-ids/expected-stdout.txt

diff --git a/test/475-regression-inliner-ids/expected.txt b/test/475-regression-inliner-ids/expected-stdout.txt
similarity index 100%
rename from test/475-regression-inliner-ids/expected.txt
rename to test/475-regression-inliner-ids/expected-stdout.txt

test/475-simplify-mul-zero/Android.bp

diff --git a/test/475-simplify-mul-zero/Android.bp b/test/475-simplify-mul-zero/Android.bp
index 05df6f8..9b6161a 100644
--- a/test/475-simplify-mul-zero/Android.bp
+++ b/test/475-simplify-mul-zero/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-475-simplify-mul-zero-expected"],
+    data: [":art-run-test-475-simplify-mul-zero-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-475-simplify-mul-zero-expected",
-    out: ["art-run-test-475-simplify-mul-zero-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-475-simplify-mul-zero-expected-stdout",
+    out: ["art-run-test-475-simplify-mul-zero-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/475-simplify-mul-zero/expected-stdout.txt

diff --git a/test/475-simplify-mul-zero/expected.txt b/test/475-simplify-mul-zero/expected-stdout.txt
similarity index 100%
rename from test/475-simplify-mul-zero/expected.txt
rename to test/475-simplify-mul-zero/expected-stdout.txt

test/476-checker-ctor-fence-redun-elim/Android.bp

diff --git a/test/476-checker-ctor-fence-redun-elim/Android.bp b/test/476-checker-ctor-fence-redun-elim/Android.bp
index bf1dbab..c9417da 100644
--- a/test/476-checker-ctor-fence-redun-elim/Android.bp
+++ b/test/476-checker-ctor-fence-redun-elim/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-476-checker-ctor-fence-redun-elim-expected"],
+    data: [":art-run-test-476-checker-ctor-fence-redun-elim-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-476-checker-ctor-fence-redun-elim-expected",
-    out: ["art-run-test-476-checker-ctor-fence-redun-elim-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-476-checker-ctor-fence-redun-elim-expected-stdout",
+    out: ["art-run-test-476-checker-ctor-fence-redun-elim-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/476-checker-ctor-fence-redun-elim/expected-stdout.txt

diff --git a/test/476-checker-ctor-fence-redun-elim/expected.txt b/test/476-checker-ctor-fence-redun-elim/expected-stdout.txt
similarity index 100%
rename from test/476-checker-ctor-fence-redun-elim/expected.txt
rename to test/476-checker-ctor-fence-redun-elim/expected-stdout.txt

test/476-checker-ctor-memory-barrier/Android.bp

diff --git a/test/476-checker-ctor-memory-barrier/Android.bp b/test/476-checker-ctor-memory-barrier/Android.bp
index d607a21..dd27d34 100644
--- a/test/476-checker-ctor-memory-barrier/Android.bp
+++ b/test/476-checker-ctor-memory-barrier/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-476-checker-ctor-memory-barrier-expected"],
+    data: [":art-run-test-476-checker-ctor-memory-barrier-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-476-checker-ctor-memory-barrier-expected",
-    out: ["art-run-test-476-checker-ctor-memory-barrier-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-476-checker-ctor-memory-barrier-expected-stdout",
+    out: ["art-run-test-476-checker-ctor-memory-barrier-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/476-checker-ctor-memory-barrier/expected-stdout.txt

diff --git a/test/476-checker-ctor-memory-barrier/expected.txt b/test/476-checker-ctor-memory-barrier/expected-stdout.txt
similarity index 100%
rename from test/476-checker-ctor-memory-barrier/expected.txt
rename to test/476-checker-ctor-memory-barrier/expected-stdout.txt

test/476-clinit-inline-static-invoke/Android.bp

diff --git a/test/476-clinit-inline-static-invoke/Android.bp b/test/476-clinit-inline-static-invoke/Android.bp
index 37483e8..f43cf46 100644
--- a/test/476-clinit-inline-static-invoke/Android.bp
+++ b/test/476-clinit-inline-static-invoke/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-476-clinit-inline-static-invoke-expected"],
+    data: [":art-run-test-476-clinit-inline-static-invoke-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-476-clinit-inline-static-invoke-expected",
-    out: ["art-run-test-476-clinit-inline-static-invoke-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-476-clinit-inline-static-invoke-expected-stdout",
+    out: ["art-run-test-476-clinit-inline-static-invoke-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/476-clinit-inline-static-invoke/expected-stdout.txt

diff --git a/test/476-clinit-inline-static-invoke/expected.txt b/test/476-clinit-inline-static-invoke/expected-stdout.txt
similarity index 100%
rename from test/476-clinit-inline-static-invoke/expected.txt
rename to test/476-clinit-inline-static-invoke/expected-stdout.txt

test/477-checker-bound-type/Android.bp

diff --git a/test/477-checker-bound-type/Android.bp b/test/477-checker-bound-type/Android.bp
index c83c2fc..f6ca552 100644
--- a/test/477-checker-bound-type/Android.bp
+++ b/test/477-checker-bound-type/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-477-checker-bound-type-expected"],
+    data: [":art-run-test-477-checker-bound-type-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-477-checker-bound-type-expected",
-    out: ["art-run-test-477-checker-bound-type-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-477-checker-bound-type-expected-stdout",
+    out: ["art-run-test-477-checker-bound-type-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/477-checker-bound-type/expected-stdout.txt

diff --git a/test/477-checker-bound-type/expected.txt b/test/477-checker-bound-type/expected-stdout.txt
similarity index 100%
rename from test/477-checker-bound-type/expected.txt
rename to test/477-checker-bound-type/expected-stdout.txt

test/477-long-2-float-convers-precision/Android.bp

diff --git a/test/477-long-2-float-convers-precision/Android.bp b/test/477-long-2-float-convers-precision/Android.bp
index 916f23c..c11f556 100644
--- a/test/477-long-2-float-convers-precision/Android.bp
+++ b/test/477-long-2-float-convers-precision/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-477-long-2-float-convers-precision-expected"],
+    data: [":art-run-test-477-long-2-float-convers-precision-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-477-long-2-float-convers-precision-expected",
-    out: ["art-run-test-477-long-2-float-convers-precision-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-477-long-2-float-convers-precision-expected-stdout",
+    out: ["art-run-test-477-long-2-float-convers-precision-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/477-long-2-float-convers-precision/expected-stdout.txt

diff --git a/test/477-long-2-float-convers-precision/expected.txt b/test/477-long-2-float-convers-precision/expected-stdout.txt
similarity index 100%
rename from test/477-long-2-float-convers-precision/expected.txt
rename to test/477-long-2-float-convers-precision/expected-stdout.txt

test/478-checker-clinit-check-pruning/Android.bp

diff --git a/test/478-checker-clinit-check-pruning/Android.bp b/test/478-checker-clinit-check-pruning/Android.bp
index 7068563..cacc5f8 100644
--- a/test/478-checker-clinit-check-pruning/Android.bp
+++ b/test/478-checker-clinit-check-pruning/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-478-checker-clinit-check-pruning-expected"],
+    data: [":art-run-test-478-checker-clinit-check-pruning-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-478-checker-clinit-check-pruning-expected",
-    out: ["art-run-test-478-checker-clinit-check-pruning-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-478-checker-clinit-check-pruning-expected-stdout",
+    out: ["art-run-test-478-checker-clinit-check-pruning-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/478-checker-clinit-check-pruning/expected-stdout.txt

diff --git a/test/478-checker-clinit-check-pruning/expected.txt b/test/478-checker-clinit-check-pruning/expected-stdout.txt
similarity index 100%
rename from test/478-checker-clinit-check-pruning/expected.txt
rename to test/478-checker-clinit-check-pruning/expected-stdout.txt

test/478-checker-inline-noreturn/Android.bp

diff --git a/test/478-checker-inline-noreturn/Android.bp b/test/478-checker-inline-noreturn/Android.bp
index 5c4b302..919fdc1 100644
--- a/test/478-checker-inline-noreturn/Android.bp
+++ b/test/478-checker-inline-noreturn/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-478-checker-inline-noreturn-expected"],
+    data: [":art-run-test-478-checker-inline-noreturn-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-478-checker-inline-noreturn-expected",
-    out: ["art-run-test-478-checker-inline-noreturn-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-478-checker-inline-noreturn-expected-stdout",
+    out: ["art-run-test-478-checker-inline-noreturn-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/478-checker-inline-noreturn/expected-stdout.txt

diff --git a/test/478-checker-inline-noreturn/expected.txt b/test/478-checker-inline-noreturn/expected-stdout.txt
similarity index 100%
rename from test/478-checker-inline-noreturn/expected.txt
rename to test/478-checker-inline-noreturn/expected-stdout.txt

test/478-checker-inliner-nested-loop/Android.bp

diff --git a/test/478-checker-inliner-nested-loop/Android.bp b/test/478-checker-inliner-nested-loop/Android.bp
index ed03cb3..4ceb7b1 100644
--- a/test/478-checker-inliner-nested-loop/Android.bp
+++ b/test/478-checker-inliner-nested-loop/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-478-checker-inliner-nested-loop-expected"],
+    data: [":art-run-test-478-checker-inliner-nested-loop-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-478-checker-inliner-nested-loop-expected",
-    out: ["art-run-test-478-checker-inliner-nested-loop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-478-checker-inliner-nested-loop-expected-stdout",
+    out: ["art-run-test-478-checker-inliner-nested-loop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/478-checker-inliner-nested-loop/expected-stdout.txt

diff --git a/test/478-checker-inliner-nested-loop/expected.txt b/test/478-checker-inliner-nested-loop/expected-stdout.txt
similarity index 100%
rename from test/478-checker-inliner-nested-loop/expected.txt
rename to test/478-checker-inliner-nested-loop/expected-stdout.txt

test/479-regression-implicit-null-check/Android.bp

diff --git a/test/479-regression-implicit-null-check/Android.bp b/test/479-regression-implicit-null-check/Android.bp
index ce7b79b..000aa0c 100644
--- a/test/479-regression-implicit-null-check/Android.bp
+++ b/test/479-regression-implicit-null-check/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-479-regression-implicit-null-check-expected"],
+    data: [":art-run-test-479-regression-implicit-null-check-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-479-regression-implicit-null-check-expected",
-    out: ["art-run-test-479-regression-implicit-null-check-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-479-regression-implicit-null-check-expected-stdout",
+    out: ["art-run-test-479-regression-implicit-null-check-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/479-regression-implicit-null-check/expected-stdout.txt

diff --git a/test/479-regression-implicit-null-check/expected.txt b/test/479-regression-implicit-null-check/expected-stdout.txt
similarity index 100%
rename from test/479-regression-implicit-null-check/expected.txt
rename to test/479-regression-implicit-null-check/expected-stdout.txt

test/480-checker-dead-blocks/Android.bp

diff --git a/test/480-checker-dead-blocks/Android.bp b/test/480-checker-dead-blocks/Android.bp
index 7d50235..76e6fef 100644
--- a/test/480-checker-dead-blocks/Android.bp
+++ b/test/480-checker-dead-blocks/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-480-checker-dead-blocks-expected"],
+    data: [":art-run-test-480-checker-dead-blocks-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-480-checker-dead-blocks-expected",
-    out: ["art-run-test-480-checker-dead-blocks-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-480-checker-dead-blocks-expected-stdout",
+    out: ["art-run-test-480-checker-dead-blocks-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/480-checker-dead-blocks/expected-stdout.txt

diff --git a/test/480-checker-dead-blocks/expected.txt b/test/480-checker-dead-blocks/expected-stdout.txt
similarity index 100%
rename from test/480-checker-dead-blocks/expected.txt
rename to test/480-checker-dead-blocks/expected-stdout.txt

test/481-regression-phi-cond/Android.bp

diff --git a/test/481-regression-phi-cond/Android.bp b/test/481-regression-phi-cond/Android.bp
index 2e3b4ca..4c90708 100644
--- a/test/481-regression-phi-cond/Android.bp
+++ b/test/481-regression-phi-cond/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-481-regression-phi-cond-expected"],
+    data: [":art-run-test-481-regression-phi-cond-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-481-regression-phi-cond-expected",
-    out: ["art-run-test-481-regression-phi-cond-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-481-regression-phi-cond-expected-stdout",
+    out: ["art-run-test-481-regression-phi-cond-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/481-regression-phi-cond/expected-stdout.txt

diff --git a/test/481-regression-phi-cond/expected.txt b/test/481-regression-phi-cond/expected-stdout.txt
similarity index 100%
rename from test/481-regression-phi-cond/expected.txt
rename to test/481-regression-phi-cond/expected-stdout.txt

test/482-checker-loop-back-edge-use/Android.bp

diff --git a/test/482-checker-loop-back-edge-use/Android.bp b/test/482-checker-loop-back-edge-use/Android.bp
index 76b3de0..e8d20b8 100644
--- a/test/482-checker-loop-back-edge-use/Android.bp
+++ b/test/482-checker-loop-back-edge-use/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-482-checker-loop-back-edge-use-expected"],
+    data: [":art-run-test-482-checker-loop-back-edge-use-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-482-checker-loop-back-edge-use-expected",
-    out: ["art-run-test-482-checker-loop-back-edge-use-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-482-checker-loop-back-edge-use-expected-stdout",
+    out: ["art-run-test-482-checker-loop-back-edge-use-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/482-checker-loop-back-edge-use/expected-stdout.txt

diff --git a/test/482-checker-loop-back-edge-use/expected.txt b/test/482-checker-loop-back-edge-use/expected-stdout.txt
similarity index 100%
rename from test/482-checker-loop-back-edge-use/expected.txt
rename to test/482-checker-loop-back-edge-use/expected-stdout.txt

test/483-dce-block/Android.bp

diff --git a/test/483-dce-block/Android.bp b/test/483-dce-block/Android.bp
index f08faa2..c258a68 100644
--- a/test/483-dce-block/Android.bp
+++ b/test/483-dce-block/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-483-dce-block-expected"],
+    data: [":art-run-test-483-dce-block-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-483-dce-block-expected",
-    out: ["art-run-test-483-dce-block-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-483-dce-block-expected-stdout",
+    out: ["art-run-test-483-dce-block-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/483-dce-block/expected-stdout.txt

diff --git a/test/483-dce-block/expected.txt b/test/483-dce-block/expected-stdout.txt
similarity index 100%
rename from test/483-dce-block/expected.txt
rename to test/483-dce-block/expected-stdout.txt

test/484-checker-register-hints/expected-stdout.txt

diff --git a/test/484-checker-register-hints/expected.txt b/test/484-checker-register-hints/expected-stdout.txt
similarity index 100%
rename from test/484-checker-register-hints/expected.txt
rename to test/484-checker-register-hints/expected-stdout.txt

test/485-checker-dce-loop-update/expected-stdout.txt

diff --git a/test/485-checker-dce-loop-update/expected.txt b/test/485-checker-dce-loop-update/expected-stdout.txt
similarity index 100%
rename from test/485-checker-dce-loop-update/expected.txt
rename to test/485-checker-dce-loop-update/expected-stdout.txt

test/485-checker-dce-switch/Android.bp

diff --git a/test/485-checker-dce-switch/Android.bp b/test/485-checker-dce-switch/Android.bp
index 97d0355..a07c2df 100644
--- a/test/485-checker-dce-switch/Android.bp
+++ b/test/485-checker-dce-switch/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-485-checker-dce-switch-expected"],
+    data: [":art-run-test-485-checker-dce-switch-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-485-checker-dce-switch-expected",
-    out: ["art-run-test-485-checker-dce-switch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-485-checker-dce-switch-expected-stdout",
+    out: ["art-run-test-485-checker-dce-switch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/485-checker-dce-switch/expected-stdout.txt

diff --git a/test/485-checker-dce-switch/expected.txt b/test/485-checker-dce-switch/expected-stdout.txt
similarity index 100%
rename from test/485-checker-dce-switch/expected.txt
rename to test/485-checker-dce-switch/expected-stdout.txt

test/486-checker-must-do-null-check/Android.bp

diff --git a/test/486-checker-must-do-null-check/Android.bp b/test/486-checker-must-do-null-check/Android.bp
index 1dc030f..81f104d 100644
--- a/test/486-checker-must-do-null-check/Android.bp
+++ b/test/486-checker-must-do-null-check/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-486-checker-must-do-null-check-expected"],
+    data: [":art-run-test-486-checker-must-do-null-check-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-486-checker-must-do-null-check-expected",
-    out: ["art-run-test-486-checker-must-do-null-check-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-486-checker-must-do-null-check-expected-stdout",
+    out: ["art-run-test-486-checker-must-do-null-check-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/486-checker-must-do-null-check/expected-stdout.txt

diff --git a/test/486-checker-must-do-null-check/expected.txt b/test/486-checker-must-do-null-check/expected-stdout.txt
similarity index 100%
rename from test/486-checker-must-do-null-check/expected.txt
rename to test/486-checker-must-do-null-check/expected-stdout.txt

test/487-checker-inline-calls/Android.bp

diff --git a/test/487-checker-inline-calls/Android.bp b/test/487-checker-inline-calls/Android.bp
index 4114e3e..5322806 100644
--- a/test/487-checker-inline-calls/Android.bp
+++ b/test/487-checker-inline-calls/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-487-checker-inline-calls-expected"],
+    data: [":art-run-test-487-checker-inline-calls-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-487-checker-inline-calls-expected",
-    out: ["art-run-test-487-checker-inline-calls-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-487-checker-inline-calls-expected-stdout",
+    out: ["art-run-test-487-checker-inline-calls-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/487-checker-inline-calls/expected-stdout.txt

diff --git a/test/487-checker-inline-calls/expected.txt b/test/487-checker-inline-calls/expected-stdout.txt
similarity index 100%
rename from test/487-checker-inline-calls/expected.txt
rename to test/487-checker-inline-calls/expected-stdout.txt

test/488-checker-inline-recursive-calls/Android.bp

diff --git a/test/488-checker-inline-recursive-calls/Android.bp b/test/488-checker-inline-recursive-calls/Android.bp
index aa78a33..854660f 100644
--- a/test/488-checker-inline-recursive-calls/Android.bp
+++ b/test/488-checker-inline-recursive-calls/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-488-checker-inline-recursive-calls-expected"],
+    data: [":art-run-test-488-checker-inline-recursive-calls-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-488-checker-inline-recursive-calls-expected",
-    out: ["art-run-test-488-checker-inline-recursive-calls-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-488-checker-inline-recursive-calls-expected-stdout",
+    out: ["art-run-test-488-checker-inline-recursive-calls-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/488-checker-inline-recursive-calls/expected-stdout.txt

diff --git a/test/488-checker-inline-recursive-calls/expected.txt b/test/488-checker-inline-recursive-calls/expected-stdout.txt
similarity index 100%
rename from test/488-checker-inline-recursive-calls/expected.txt
rename to test/488-checker-inline-recursive-calls/expected-stdout.txt

test/489-current-method-regression/Android.bp

diff --git a/test/489-current-method-regression/Android.bp b/test/489-current-method-regression/Android.bp
index f762e63..723ae10 100644
--- a/test/489-current-method-regression/Android.bp
+++ b/test/489-current-method-regression/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-489-current-method-regression-expected"],
+    data: [":art-run-test-489-current-method-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-489-current-method-regression-expected",
-    out: ["art-run-test-489-current-method-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-489-current-method-regression-expected-stdout",
+    out: ["art-run-test-489-current-method-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/489-current-method-regression/expected-stdout.txt

diff --git a/test/489-current-method-regression/expected.txt b/test/489-current-method-regression/expected-stdout.txt
similarity index 100%
rename from test/489-current-method-regression/expected.txt
rename to test/489-current-method-regression/expected-stdout.txt

test/490-checker-inline/Android.bp

diff --git a/test/490-checker-inline/Android.bp b/test/490-checker-inline/Android.bp
index 3126b3c..1e833b6 100644
--- a/test/490-checker-inline/Android.bp
+++ b/test/490-checker-inline/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-490-checker-inline-expected"],
+    data: [":art-run-test-490-checker-inline-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-490-checker-inline-expected",
-    out: ["art-run-test-490-checker-inline-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-490-checker-inline-expected-stdout",
+    out: ["art-run-test-490-checker-inline-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/490-checker-inline/expected-stdout.txt

diff --git a/test/490-checker-inline/expected.txt b/test/490-checker-inline/expected-stdout.txt
similarity index 100%
rename from test/490-checker-inline/expected.txt
rename to test/490-checker-inline/expected-stdout.txt

test/491-current-method/Android.bp

diff --git a/test/491-current-method/Android.bp b/test/491-current-method/Android.bp
index d4063ad..78e8688 100644
--- a/test/491-current-method/Android.bp
+++ b/test/491-current-method/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-491-current-method-expected"],
+    data: [":art-run-test-491-current-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-491-current-method-expected",
-    out: ["art-run-test-491-current-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-491-current-method-expected-stdout",
+    out: ["art-run-test-491-current-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/491-current-method/expected-stdout.txt

diff --git a/test/491-current-method/expected.txt b/test/491-current-method/expected-stdout.txt
similarity index 100%
rename from test/491-current-method/expected.txt
rename to test/491-current-method/expected-stdout.txt

test/492-checker-inline-invoke-interface/Android.bp

diff --git a/test/492-checker-inline-invoke-interface/Android.bp b/test/492-checker-inline-invoke-interface/Android.bp
index eb99ee8..9e1a3f1 100644
--- a/test/492-checker-inline-invoke-interface/Android.bp
+++ b/test/492-checker-inline-invoke-interface/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-492-checker-inline-invoke-interface-expected"],
+    data: [":art-run-test-492-checker-inline-invoke-interface-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-492-checker-inline-invoke-interface-expected",
-    out: ["art-run-test-492-checker-inline-invoke-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-492-checker-inline-invoke-interface-expected-stdout",
+    out: ["art-run-test-492-checker-inline-invoke-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/492-checker-inline-invoke-interface/expected-stdout.txt

diff --git a/test/492-checker-inline-invoke-interface/expected.txt b/test/492-checker-inline-invoke-interface/expected-stdout.txt
similarity index 100%
rename from test/492-checker-inline-invoke-interface/expected.txt
rename to test/492-checker-inline-invoke-interface/expected-stdout.txt

test/493-checker-inline-invoke-interface/Android.bp

diff --git a/test/493-checker-inline-invoke-interface/Android.bp b/test/493-checker-inline-invoke-interface/Android.bp
index 7437472..72be63b 100644
--- a/test/493-checker-inline-invoke-interface/Android.bp
+++ b/test/493-checker-inline-invoke-interface/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-493-checker-inline-invoke-interface-expected"],
+    data: [":art-run-test-493-checker-inline-invoke-interface-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-493-checker-inline-invoke-interface-expected",
-    out: ["art-run-test-493-checker-inline-invoke-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-493-checker-inline-invoke-interface-expected-stdout",
+    out: ["art-run-test-493-checker-inline-invoke-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/493-checker-inline-invoke-interface/expected-stdout.txt

diff --git a/test/493-checker-inline-invoke-interface/expected.txt b/test/493-checker-inline-invoke-interface/expected-stdout.txt
similarity index 100%
rename from test/493-checker-inline-invoke-interface/expected.txt
rename to test/493-checker-inline-invoke-interface/expected-stdout.txt

test/494-checker-instanceof-tests/Android.bp

diff --git a/test/494-checker-instanceof-tests/Android.bp b/test/494-checker-instanceof-tests/Android.bp
index c04b433..c139c0d 100644
--- a/test/494-checker-instanceof-tests/Android.bp
+++ b/test/494-checker-instanceof-tests/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-494-checker-instanceof-tests-expected"],
+    data: [":art-run-test-494-checker-instanceof-tests-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-494-checker-instanceof-tests-expected",
-    out: ["art-run-test-494-checker-instanceof-tests-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-494-checker-instanceof-tests-expected-stdout",
+    out: ["art-run-test-494-checker-instanceof-tests-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/494-checker-instanceof-tests/expected-stdout.txt

diff --git a/test/494-checker-instanceof-tests/expected.txt b/test/494-checker-instanceof-tests/expected-stdout.txt
similarity index 100%
rename from test/494-checker-instanceof-tests/expected.txt
rename to test/494-checker-instanceof-tests/expected-stdout.txt

test/495-checker-checkcast-tests/Android.bp

diff --git a/test/495-checker-checkcast-tests/Android.bp b/test/495-checker-checkcast-tests/Android.bp
index 2538927..acf24cd 100644
--- a/test/495-checker-checkcast-tests/Android.bp
+++ b/test/495-checker-checkcast-tests/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-495-checker-checkcast-tests-expected"],
+    data: [":art-run-test-495-checker-checkcast-tests-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-495-checker-checkcast-tests-expected",
-    out: ["art-run-test-495-checker-checkcast-tests-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-495-checker-checkcast-tests-expected-stdout",
+    out: ["art-run-test-495-checker-checkcast-tests-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/495-checker-checkcast-tests/expected-stdout.txt

diff --git a/test/495-checker-checkcast-tests/expected.txt b/test/495-checker-checkcast-tests/expected-stdout.txt
similarity index 100%
rename from test/495-checker-checkcast-tests/expected.txt
rename to test/495-checker-checkcast-tests/expected-stdout.txt

test/496-checker-inlining-class-loader/Android.bp

diff --git a/test/496-checker-inlining-class-loader/Android.bp b/test/496-checker-inlining-class-loader/Android.bp
index 48e0591..7c684c5 100644
--- a/test/496-checker-inlining-class-loader/Android.bp
+++ b/test/496-checker-inlining-class-loader/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-496-checker-inlining-class-loader-expected"],
+    data: [":art-run-test-496-checker-inlining-class-loader-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-496-checker-inlining-class-loader-expected",
-    out: ["art-run-test-496-checker-inlining-class-loader-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-496-checker-inlining-class-loader-expected-stdout",
+    out: ["art-run-test-496-checker-inlining-class-loader-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/496-checker-inlining-class-loader/expected-stdout.txt

diff --git a/test/496-checker-inlining-class-loader/expected.txt b/test/496-checker-inlining-class-loader/expected-stdout.txt
similarity index 100%
rename from test/496-checker-inlining-class-loader/expected.txt
rename to test/496-checker-inlining-class-loader/expected-stdout.txt

test/497-inlining-and-class-loader/Android.bp

diff --git a/test/497-inlining-and-class-loader/Android.bp b/test/497-inlining-and-class-loader/Android.bp
index e08e796..539b42c 100644
--- a/test/497-inlining-and-class-loader/Android.bp
+++ b/test/497-inlining-and-class-loader/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-497-inlining-and-class-loader-expected"],
+    data: [":art-run-test-497-inlining-and-class-loader-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-497-inlining-and-class-loader-expected",
-    out: ["art-run-test-497-inlining-and-class-loader-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-497-inlining-and-class-loader-expected-stdout",
+    out: ["art-run-test-497-inlining-and-class-loader-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/497-inlining-and-class-loader/expected-stdout.txt

diff --git a/test/497-inlining-and-class-loader/expected.txt b/test/497-inlining-and-class-loader/expected-stdout.txt
similarity index 100%
rename from test/497-inlining-and-class-loader/expected.txt
rename to test/497-inlining-and-class-loader/expected-stdout.txt

test/498-type-propagation/expected-stdout.txt

diff --git a/test/498-type-propagation/expected.txt b/test/498-type-propagation/expected-stdout.txt
similarity index 100%
rename from test/498-type-propagation/expected.txt
rename to test/498-type-propagation/expected-stdout.txt

test/499-bce-phi-array-length/Android.bp

diff --git a/test/499-bce-phi-array-length/Android.bp b/test/499-bce-phi-array-length/Android.bp
index 3dadc76..d11b508 100644
--- a/test/499-bce-phi-array-length/Android.bp
+++ b/test/499-bce-phi-array-length/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-499-bce-phi-array-length-expected"],
+    data: [":art-run-test-499-bce-phi-array-length-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-499-bce-phi-array-length-expected",
-    out: ["art-run-test-499-bce-phi-array-length-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-499-bce-phi-array-length-expected-stdout",
+    out: ["art-run-test-499-bce-phi-array-length-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/499-bce-phi-array-length/expected-stdout.txt

diff --git a/test/499-bce-phi-array-length/expected.txt b/test/499-bce-phi-array-length/expected-stdout.txt
similarity index 100%
rename from test/499-bce-phi-array-length/expected.txt
rename to test/499-bce-phi-array-length/expected-stdout.txt

test/500-instanceof/Android.bp

diff --git a/test/500-instanceof/Android.bp b/test/500-instanceof/Android.bp
index 666993c..9a54922 100644
--- a/test/500-instanceof/Android.bp
+++ b/test/500-instanceof/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-500-instanceof-expected"],
+    data: [":art-run-test-500-instanceof-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-500-instanceof-expected",
-    out: ["art-run-test-500-instanceof-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-500-instanceof-expected-stdout",
+    out: ["art-run-test-500-instanceof-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/500-instanceof/expected-stdout.txt

diff --git a/test/500-instanceof/expected.txt b/test/500-instanceof/expected-stdout.txt
similarity index 100%
rename from test/500-instanceof/expected.txt
rename to test/500-instanceof/expected-stdout.txt

test/501-null-constant-dce/expected-stdout.txt

diff --git a/test/501-null-constant-dce/expected.txt b/test/501-null-constant-dce/expected-stdout.txt
similarity index 100%
rename from test/501-null-constant-dce/expected.txt
rename to test/501-null-constant-dce/expected-stdout.txt

test/501-regression-packed-switch/expected-stdout.txt

diff --git a/test/501-regression-packed-switch/expected.txt b/test/501-regression-packed-switch/expected-stdout.txt
similarity index 100%
rename from test/501-regression-packed-switch/expected.txt
rename to test/501-regression-packed-switch/expected-stdout.txt

test/503-dead-instructions/expected-stdout.txt

diff --git a/test/503-dead-instructions/expected.txt b/test/503-dead-instructions/expected-stdout.txt
similarity index 100%
rename from test/503-dead-instructions/expected.txt
rename to test/503-dead-instructions/expected-stdout.txt

test/504-regression-baseline-entry/expected-stdout.txt

diff --git a/test/504-regression-baseline-entry/expected.txt b/test/504-regression-baseline-entry/expected-stdout.txt
similarity index 100%
rename from test/504-regression-baseline-entry/expected.txt
rename to test/504-regression-baseline-entry/expected-stdout.txt

test/505-simplifier-type-propagation/Android.bp

diff --git a/test/505-simplifier-type-propagation/Android.bp b/test/505-simplifier-type-propagation/Android.bp
index 4c64f72..82c3218 100644
--- a/test/505-simplifier-type-propagation/Android.bp
+++ b/test/505-simplifier-type-propagation/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-505-simplifier-type-propagation-expected"],
+    data: [":art-run-test-505-simplifier-type-propagation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-505-simplifier-type-propagation-expected",
-    out: ["art-run-test-505-simplifier-type-propagation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-505-simplifier-type-propagation-expected-stdout",
+    out: ["art-run-test-505-simplifier-type-propagation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/505-simplifier-type-propagation/expected-stdout.txt

diff --git a/test/505-simplifier-type-propagation/expected.txt b/test/505-simplifier-type-propagation/expected-stdout.txt
similarity index 100%
rename from test/505-simplifier-type-propagation/expected.txt
rename to test/505-simplifier-type-propagation/expected-stdout.txt

test/506-verify-aput/expected-stdout.txt

diff --git a/test/506-verify-aput/expected.txt b/test/506-verify-aput/expected-stdout.txt
similarity index 100%
rename from test/506-verify-aput/expected.txt
rename to test/506-verify-aput/expected-stdout.txt

test/507-boolean-test/Android.bp

diff --git a/test/507-boolean-test/Android.bp b/test/507-boolean-test/Android.bp
index 1125f2c..6cf0514 100644
--- a/test/507-boolean-test/Android.bp
+++ b/test/507-boolean-test/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-507-boolean-test-expected"],
+    data: [":art-run-test-507-boolean-test-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-507-boolean-test-expected",
-    out: ["art-run-test-507-boolean-test-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-507-boolean-test-expected-stdout",
+    out: ["art-run-test-507-boolean-test-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/507-boolean-test/expected-stdout.txt

diff --git a/test/507-boolean-test/expected.txt b/test/507-boolean-test/expected-stdout.txt
similarity index 100%
rename from test/507-boolean-test/expected.txt
rename to test/507-boolean-test/expected-stdout.txt

test/507-referrer/Android.bp

diff --git a/test/507-referrer/Android.bp b/test/507-referrer/Android.bp
index 749ffa7..f1b24ff 100644
--- a/test/507-referrer/Android.bp
+++ b/test/507-referrer/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-507-referrer-expected"],
+    data: [":art-run-test-507-referrer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-507-referrer-expected",
-    out: ["art-run-test-507-referrer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-507-referrer-expected-stdout",
+    out: ["art-run-test-507-referrer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/507-referrer/expected-stdout.txt

diff --git a/test/507-referrer/expected.txt b/test/507-referrer/expected-stdout.txt
similarity index 100%
rename from test/507-referrer/expected.txt
rename to test/507-referrer/expected-stdout.txt

test/508-checker-disassembly/Android.bp

diff --git a/test/508-checker-disassembly/Android.bp b/test/508-checker-disassembly/Android.bp
index 47d90b8..0b2d45f 100644
--- a/test/508-checker-disassembly/Android.bp
+++ b/test/508-checker-disassembly/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-508-checker-disassembly-expected"],
+    data: [":art-run-test-508-checker-disassembly-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-508-checker-disassembly-expected",
-    out: ["art-run-test-508-checker-disassembly-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-508-checker-disassembly-expected-stdout",
+    out: ["art-run-test-508-checker-disassembly-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/508-checker-disassembly/expected-stdout.txt

diff --git a/test/508-checker-disassembly/expected.txt b/test/508-checker-disassembly/expected-stdout.txt
similarity index 100%
rename from test/508-checker-disassembly/expected.txt
rename to test/508-checker-disassembly/expected-stdout.txt

test/508-referrer-method/Android.bp

diff --git a/test/508-referrer-method/Android.bp b/test/508-referrer-method/Android.bp
index 53e4d03..fb26624 100644
--- a/test/508-referrer-method/Android.bp
+++ b/test/508-referrer-method/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-508-referrer-method-expected"],
+    data: [":art-run-test-508-referrer-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-508-referrer-method-expected",
-    out: ["art-run-test-508-referrer-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-508-referrer-method-expected-stdout",
+    out: ["art-run-test-508-referrer-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/508-referrer-method/expected-stdout.txt

diff --git a/test/508-referrer-method/expected.txt b/test/508-referrer-method/expected-stdout.txt
similarity index 100%
rename from test/508-referrer-method/expected.txt
rename to test/508-referrer-method/expected-stdout.txt

test/509-pre-header/expected-stdout.txt

diff --git a/test/509-pre-header/expected.txt b/test/509-pre-header/expected-stdout.txt
similarity index 100%
rename from test/509-pre-header/expected.txt
rename to test/509-pre-header/expected-stdout.txt

test/510-checker-try-catch/expected-stdout.txt

diff --git a/test/510-checker-try-catch/expected.txt b/test/510-checker-try-catch/expected-stdout.txt
similarity index 100%
rename from test/510-checker-try-catch/expected.txt
rename to test/510-checker-try-catch/expected-stdout.txt

test/511-clinit-interface/expected-stdout.txt

diff --git a/test/511-clinit-interface/expected.txt b/test/511-clinit-interface/expected-stdout.txt
similarity index 100%
rename from test/511-clinit-interface/expected.txt
rename to test/511-clinit-interface/expected-stdout.txt

test/513-array-deopt/Android.bp

diff --git a/test/513-array-deopt/Android.bp b/test/513-array-deopt/Android.bp
index 2310b46..4236ad7 100644
--- a/test/513-array-deopt/Android.bp
+++ b/test/513-array-deopt/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-513-array-deopt-expected"],
+    data: [":art-run-test-513-array-deopt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-513-array-deopt-expected",
-    out: ["art-run-test-513-array-deopt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-513-array-deopt-expected-stdout",
+    out: ["art-run-test-513-array-deopt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/513-array-deopt/expected-stdout.txt

diff --git a/test/513-array-deopt/expected.txt b/test/513-array-deopt/expected-stdout.txt
similarity index 100%
rename from test/513-array-deopt/expected.txt
rename to test/513-array-deopt/expected-stdout.txt

test/514-shifts/Android.bp

diff --git a/test/514-shifts/Android.bp b/test/514-shifts/Android.bp
index 359e441..26f4a3d 100644
--- a/test/514-shifts/Android.bp
+++ b/test/514-shifts/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-514-shifts-expected"],
+    data: [":art-run-test-514-shifts-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-514-shifts-expected",
-    out: ["art-run-test-514-shifts-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-514-shifts-expected-stdout",
+    out: ["art-run-test-514-shifts-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/514-shifts/expected-stdout.txt

diff --git a/test/514-shifts/expected.txt b/test/514-shifts/expected-stdout.txt
similarity index 100%
rename from test/514-shifts/expected.txt
rename to test/514-shifts/expected-stdout.txt

test/515-dce-dominator/expected-stdout.txt

diff --git a/test/515-dce-dominator/expected.txt b/test/515-dce-dominator/expected-stdout.txt
similarity index 100%
rename from test/515-dce-dominator/expected.txt
rename to test/515-dce-dominator/expected-stdout.txt

test/516-dead-move-result/expected-stdout.txt

diff --git a/test/516-dead-move-result/expected.txt b/test/516-dead-move-result/expected-stdout.txt
similarity index 100%
rename from test/516-dead-move-result/expected.txt
rename to test/516-dead-move-result/expected-stdout.txt

test/517-checker-builder-fallthrough/expected-stdout.txt

diff --git a/test/517-checker-builder-fallthrough/expected.txt b/test/517-checker-builder-fallthrough/expected-stdout.txt
similarity index 100%
rename from test/517-checker-builder-fallthrough/expected.txt
rename to test/517-checker-builder-fallthrough/expected-stdout.txt

test/518-null-array-get/expected-stdout.txt

diff --git a/test/518-null-array-get/expected.txt b/test/518-null-array-get/expected-stdout.txt
similarity index 100%
rename from test/518-null-array-get/expected.txt
rename to test/518-null-array-get/expected-stdout.txt

test/519-bound-load-class/Android.bp

diff --git a/test/519-bound-load-class/Android.bp b/test/519-bound-load-class/Android.bp
index b97502a..0c37356 100644
--- a/test/519-bound-load-class/Android.bp
+++ b/test/519-bound-load-class/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-519-bound-load-class-expected"],
+    data: [":art-run-test-519-bound-load-class-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-519-bound-load-class-expected",
-    out: ["art-run-test-519-bound-load-class-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-519-bound-load-class-expected-stdout",
+    out: ["art-run-test-519-bound-load-class-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/519-bound-load-class/expected-stdout.txt

diff --git a/test/519-bound-load-class/expected.txt b/test/519-bound-load-class/expected-stdout.txt
similarity index 100%
rename from test/519-bound-load-class/expected.txt
rename to test/519-bound-load-class/expected-stdout.txt

test/520-equivalent-phi/expected-stdout.txt

diff --git a/test/520-equivalent-phi/expected.txt b/test/520-equivalent-phi/expected-stdout.txt
similarity index 100%
rename from test/520-equivalent-phi/expected.txt
rename to test/520-equivalent-phi/expected-stdout.txt

test/521-checker-array-set-null/Android.bp

diff --git a/test/521-checker-array-set-null/Android.bp b/test/521-checker-array-set-null/Android.bp
index bfeb94b..3a11247 100644
--- a/test/521-checker-array-set-null/Android.bp
+++ b/test/521-checker-array-set-null/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-521-checker-array-set-null-expected"],
+    data: [":art-run-test-521-checker-array-set-null-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-521-checker-array-set-null-expected",
-    out: ["art-run-test-521-checker-array-set-null-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-521-checker-array-set-null-expected-stdout",
+    out: ["art-run-test-521-checker-array-set-null-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/521-checker-array-set-null/expected-stdout.txt

diff --git a/test/521-checker-array-set-null/expected.txt b/test/521-checker-array-set-null/expected-stdout.txt
similarity index 100%
rename from test/521-checker-array-set-null/expected.txt
rename to test/521-checker-array-set-null/expected-stdout.txt

test/521-regression-integer-field-set/Android.bp

diff --git a/test/521-regression-integer-field-set/Android.bp b/test/521-regression-integer-field-set/Android.bp
index a84031a..cd32bba 100644
--- a/test/521-regression-integer-field-set/Android.bp
+++ b/test/521-regression-integer-field-set/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-521-regression-integer-field-set-expected"],
+    data: [":art-run-test-521-regression-integer-field-set-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-521-regression-integer-field-set-expected",
-    out: ["art-run-test-521-regression-integer-field-set-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-521-regression-integer-field-set-expected-stdout",
+    out: ["art-run-test-521-regression-integer-field-set-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/521-regression-integer-field-set/expected-stdout.txt

diff --git a/test/521-regression-integer-field-set/expected.txt b/test/521-regression-integer-field-set/expected-stdout.txt
similarity index 100%
rename from test/521-regression-integer-field-set/expected.txt
rename to test/521-regression-integer-field-set/expected-stdout.txt

test/522-checker-regression-monitor-exit/expected-stdout.txt

diff --git a/test/522-checker-regression-monitor-exit/expected.txt b/test/522-checker-regression-monitor-exit/expected-stdout.txt
similarity index 100%
rename from test/522-checker-regression-monitor-exit/expected.txt
rename to test/522-checker-regression-monitor-exit/expected-stdout.txt

test/523-checker-can-throw-regression/expected-stdout.txt

diff --git a/test/523-checker-can-throw-regression/expected.txt b/test/523-checker-can-throw-regression/expected-stdout.txt
similarity index 100%
rename from test/523-checker-can-throw-regression/expected.txt
rename to test/523-checker-can-throw-regression/expected-stdout.txt

test/524-boolean-simplifier-regression/Android.bp

diff --git a/test/524-boolean-simplifier-regression/Android.bp b/test/524-boolean-simplifier-regression/Android.bp
index 31e4da6..4a58143 100644
--- a/test/524-boolean-simplifier-regression/Android.bp
+++ b/test/524-boolean-simplifier-regression/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-524-boolean-simplifier-regression-expected"],
+    data: [":art-run-test-524-boolean-simplifier-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-524-boolean-simplifier-regression-expected",
-    out: ["art-run-test-524-boolean-simplifier-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-524-boolean-simplifier-regression-expected-stdout",
+    out: ["art-run-test-524-boolean-simplifier-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/524-boolean-simplifier-regression/expected-stdout.txt

diff --git a/test/524-boolean-simplifier-regression/expected.txt b/test/524-boolean-simplifier-regression/expected-stdout.txt
similarity index 100%
rename from test/524-boolean-simplifier-regression/expected.txt
rename to test/524-boolean-simplifier-regression/expected-stdout.txt

test/525-checker-arrays-fields1/Android.bp

diff --git a/test/525-checker-arrays-fields1/Android.bp b/test/525-checker-arrays-fields1/Android.bp
index 91f26ea..0bf84be 100644
--- a/test/525-checker-arrays-fields1/Android.bp
+++ b/test/525-checker-arrays-fields1/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-525-checker-arrays-fields1-expected"],
+    data: [":art-run-test-525-checker-arrays-fields1-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-525-checker-arrays-fields1-expected",
-    out: ["art-run-test-525-checker-arrays-fields1-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-525-checker-arrays-fields1-expected-stdout",
+    out: ["art-run-test-525-checker-arrays-fields1-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/525-checker-arrays-fields1/expected-stdout.txt

diff --git a/test/525-checker-arrays-fields1/expected.txt b/test/525-checker-arrays-fields1/expected-stdout.txt
similarity index 100%
rename from test/525-checker-arrays-fields1/expected.txt
rename to test/525-checker-arrays-fields1/expected-stdout.txt

test/525-checker-arrays-fields2/Android.bp

diff --git a/test/525-checker-arrays-fields2/Android.bp b/test/525-checker-arrays-fields2/Android.bp
index aec6f3d..e603694 100644
--- a/test/525-checker-arrays-fields2/Android.bp
+++ b/test/525-checker-arrays-fields2/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-525-checker-arrays-fields2-expected"],
+    data: [":art-run-test-525-checker-arrays-fields2-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-525-checker-arrays-fields2-expected",
-    out: ["art-run-test-525-checker-arrays-fields2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-525-checker-arrays-fields2-expected-stdout",
+    out: ["art-run-test-525-checker-arrays-fields2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/525-checker-arrays-fields2/expected-stdout.txt

diff --git a/test/525-checker-arrays-fields2/expected.txt b/test/525-checker-arrays-fields2/expected-stdout.txt
similarity index 100%
rename from test/525-checker-arrays-fields2/expected.txt
rename to test/525-checker-arrays-fields2/expected-stdout.txt

test/526-checker-caller-callee-regs/Android.bp

diff --git a/test/526-checker-caller-callee-regs/Android.bp b/test/526-checker-caller-callee-regs/Android.bp
index d91f2e0..19a7d1e 100644
--- a/test/526-checker-caller-callee-regs/Android.bp
+++ b/test/526-checker-caller-callee-regs/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-526-checker-caller-callee-regs-expected"],
+    data: [":art-run-test-526-checker-caller-callee-regs-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-526-checker-caller-callee-regs-expected",
-    out: ["art-run-test-526-checker-caller-callee-regs-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-526-checker-caller-callee-regs-expected-stdout",
+    out: ["art-run-test-526-checker-caller-callee-regs-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/526-checker-caller-callee-regs/expected-stdout.txt

diff --git a/test/526-checker-caller-callee-regs/expected.txt b/test/526-checker-caller-callee-regs/expected-stdout.txt
similarity index 100%
rename from test/526-checker-caller-callee-regs/expected.txt
rename to test/526-checker-caller-callee-regs/expected-stdout.txt

test/526-long-regalloc/Android.bp

diff --git a/test/526-long-regalloc/Android.bp b/test/526-long-regalloc/Android.bp
index 4654558..dd907a2 100644
--- a/test/526-long-regalloc/Android.bp
+++ b/test/526-long-regalloc/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-526-long-regalloc-expected"],
+    data: [":art-run-test-526-long-regalloc-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-526-long-regalloc-expected",
-    out: ["art-run-test-526-long-regalloc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-526-long-regalloc-expected-stdout",
+    out: ["art-run-test-526-long-regalloc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/526-long-regalloc/expected-stdout.txt

diff --git a/test/526-long-regalloc/expected.txt b/test/526-long-regalloc/expected-stdout.txt
similarity index 100%
rename from test/526-long-regalloc/expected.txt
rename to test/526-long-regalloc/expected-stdout.txt

test/527-checker-array-access-simd/Android.bp

diff --git a/test/527-checker-array-access-simd/Android.bp b/test/527-checker-array-access-simd/Android.bp
index bb17d0a..82b8848 100644
--- a/test/527-checker-array-access-simd/Android.bp
+++ b/test/527-checker-array-access-simd/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-527-checker-array-access-simd-expected"],
+    data: [":art-run-test-527-checker-array-access-simd-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-527-checker-array-access-simd-expected",
-    out: ["art-run-test-527-checker-array-access-simd-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-527-checker-array-access-simd-expected-stdout",
+    out: ["art-run-test-527-checker-array-access-simd-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/527-checker-array-access-simd/expected-stdout.txt

diff --git a/test/527-checker-array-access-simd/expected.txt b/test/527-checker-array-access-simd/expected-stdout.txt
similarity index 100%
rename from test/527-checker-array-access-simd/expected.txt
rename to test/527-checker-array-access-simd/expected-stdout.txt

test/527-checker-array-access-split/Android.bp

diff --git a/test/527-checker-array-access-split/Android.bp b/test/527-checker-array-access-split/Android.bp
index 09b10b6..db92aec 100644
--- a/test/527-checker-array-access-split/Android.bp
+++ b/test/527-checker-array-access-split/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-527-checker-array-access-split-expected"],
+    data: [":art-run-test-527-checker-array-access-split-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-527-checker-array-access-split-expected",
-    out: ["art-run-test-527-checker-array-access-split-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-527-checker-array-access-split-expected-stdout",
+    out: ["art-run-test-527-checker-array-access-split-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/527-checker-array-access-split/expected-stdout.txt

diff --git a/test/527-checker-array-access-split/expected.txt b/test/527-checker-array-access-split/expected-stdout.txt
similarity index 100%
rename from test/527-checker-array-access-split/expected.txt
rename to test/527-checker-array-access-split/expected-stdout.txt

test/528-long-hint/Android.bp

diff --git a/test/528-long-hint/Android.bp b/test/528-long-hint/Android.bp
index edcc1f8..6155c43 100644
--- a/test/528-long-hint/Android.bp
+++ b/test/528-long-hint/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-528-long-hint-expected"],
+    data: [":art-run-test-528-long-hint-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-528-long-hint-expected",
-    out: ["art-run-test-528-long-hint-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-528-long-hint-expected-stdout",
+    out: ["art-run-test-528-long-hint-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/528-long-hint/expected-stdout.txt

diff --git a/test/528-long-hint/expected.txt b/test/528-long-hint/expected-stdout.txt
similarity index 100%
rename from test/528-long-hint/expected.txt
rename to test/528-long-hint/expected-stdout.txt

test/529-checker-unresolved/expected-stdout.txt

diff --git a/test/529-checker-unresolved/expected.txt b/test/529-checker-unresolved/expected-stdout.txt
similarity index 100%
rename from test/529-checker-unresolved/expected.txt
rename to test/529-checker-unresolved/expected-stdout.txt

test/529-long-split/Android.bp

diff --git a/test/529-long-split/Android.bp b/test/529-long-split/Android.bp
index 8bc67a2..ae05550 100644
--- a/test/529-long-split/Android.bp
+++ b/test/529-long-split/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-529-long-split-expected"],
+    data: [":art-run-test-529-long-split-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-529-long-split-expected",
-    out: ["art-run-test-529-long-split-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-529-long-split-expected-stdout",
+    out: ["art-run-test-529-long-split-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/529-long-split/expected-stdout.txt

diff --git a/test/529-long-split/expected.txt b/test/529-long-split/expected-stdout.txt
similarity index 100%
rename from test/529-long-split/expected.txt
rename to test/529-long-split/expected-stdout.txt

test/530-checker-loops1/Android.bp

diff --git a/test/530-checker-loops1/Android.bp b/test/530-checker-loops1/Android.bp
index f5572fb..2baadae 100644
--- a/test/530-checker-loops1/Android.bp
+++ b/test/530-checker-loops1/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-loops1-expected"],
+    data: [":art-run-test-530-checker-loops1-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-loops1-expected",
-    out: ["art-run-test-530-checker-loops1-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-loops1-expected-stdout",
+    out: ["art-run-test-530-checker-loops1-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/530-checker-loops1/expected-stdout.txt

diff --git a/test/530-checker-loops1/expected.txt b/test/530-checker-loops1/expected-stdout.txt
similarity index 100%
rename from test/530-checker-loops1/expected.txt
rename to test/530-checker-loops1/expected-stdout.txt

test/530-checker-loops2/Android.bp

diff --git a/test/530-checker-loops2/Android.bp b/test/530-checker-loops2/Android.bp
index 8d8fa3a..c3c75a2 100644
--- a/test/530-checker-loops2/Android.bp
+++ b/test/530-checker-loops2/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-loops2-expected"],
+    data: [":art-run-test-530-checker-loops2-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-loops2-expected",
-    out: ["art-run-test-530-checker-loops2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-loops2-expected-stdout",
+    out: ["art-run-test-530-checker-loops2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/530-checker-loops2/expected-stdout.txt

diff --git a/test/530-checker-loops2/expected.txt b/test/530-checker-loops2/expected-stdout.txt
similarity index 100%
rename from test/530-checker-loops2/expected.txt
rename to test/530-checker-loops2/expected-stdout.txt

test/530-checker-loops3/Android.bp

diff --git a/test/530-checker-loops3/Android.bp b/test/530-checker-loops3/Android.bp
index 2abe4a5..5c39784 100644
--- a/test/530-checker-loops3/Android.bp
+++ b/test/530-checker-loops3/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-loops3-expected"],
+    data: [":art-run-test-530-checker-loops3-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-loops3-expected",
-    out: ["art-run-test-530-checker-loops3-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-loops3-expected-stdout",
+    out: ["art-run-test-530-checker-loops3-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/530-checker-loops3/expected-stdout.txt

diff --git a/test/530-checker-loops3/expected.txt b/test/530-checker-loops3/expected-stdout.txt
similarity index 100%
rename from test/530-checker-loops3/expected.txt
rename to test/530-checker-loops3/expected-stdout.txt

test/530-checker-loops4/Android.bp

diff --git a/test/530-checker-loops4/Android.bp b/test/530-checker-loops4/Android.bp
index c89fc9c..390dad9 100644
--- a/test/530-checker-loops4/Android.bp
+++ b/test/530-checker-loops4/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-loops4-expected"],
+    data: [":art-run-test-530-checker-loops4-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-loops4-expected",
-    out: ["art-run-test-530-checker-loops4-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-loops4-expected-stdout",
+    out: ["art-run-test-530-checker-loops4-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/530-checker-loops4/expected-stdout.txt

diff --git a/test/530-checker-loops4/expected.txt b/test/530-checker-loops4/expected-stdout.txt
similarity index 100%
rename from test/530-checker-loops4/expected.txt
rename to test/530-checker-loops4/expected-stdout.txt

test/530-checker-loops5/Android.bp

diff --git a/test/530-checker-loops5/Android.bp b/test/530-checker-loops5/Android.bp
index 98b856f..12487ed 100644
--- a/test/530-checker-loops5/Android.bp
+++ b/test/530-checker-loops5/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-loops5-expected"],
+    data: [":art-run-test-530-checker-loops5-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-loops5-expected",
-    out: ["art-run-test-530-checker-loops5-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-loops5-expected-stdout",
+    out: ["art-run-test-530-checker-loops5-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/530-checker-loops5/expected-stdout.txt

diff --git a/test/530-checker-loops5/expected.txt b/test/530-checker-loops5/expected-stdout.txt
similarity index 100%
rename from test/530-checker-loops5/expected.txt
rename to test/530-checker-loops5/expected-stdout.txt

test/530-checker-lse-ctor-fences/Android.bp

diff --git a/test/530-checker-lse-ctor-fences/Android.bp b/test/530-checker-lse-ctor-fences/Android.bp
index d84a66a..5e9a265 100644
--- a/test/530-checker-lse-ctor-fences/Android.bp
+++ b/test/530-checker-lse-ctor-fences/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-lse-ctor-fences-expected"],
+    data: [":art-run-test-530-checker-lse-ctor-fences-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-lse-ctor-fences-expected",
-    out: ["art-run-test-530-checker-lse-ctor-fences-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-lse-ctor-fences-expected-stdout",
+    out: ["art-run-test-530-checker-lse-ctor-fences-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/530-checker-lse-ctor-fences/expected-stdout.txt

diff --git a/test/530-checker-lse-ctor-fences/expected.txt b/test/530-checker-lse-ctor-fences/expected-stdout.txt
similarity index 100%
rename from test/530-checker-lse-ctor-fences/expected.txt
rename to test/530-checker-lse-ctor-fences/expected-stdout.txt

test/530-checker-lse-simd/Android.bp

diff --git a/test/530-checker-lse-simd/Android.bp b/test/530-checker-lse-simd/Android.bp
index daf1066..88dc1ad 100644
--- a/test/530-checker-lse-simd/Android.bp
+++ b/test/530-checker-lse-simd/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-lse-simd-expected"],
+    data: [":art-run-test-530-checker-lse-simd-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-lse-simd-expected",
-    out: ["art-run-test-530-checker-lse-simd-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-lse-simd-expected-stdout",
+    out: ["art-run-test-530-checker-lse-simd-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/530-checker-lse-simd/expected-stdout.txt

diff --git a/test/530-checker-lse-simd/expected.txt b/test/530-checker-lse-simd/expected-stdout.txt
similarity index 100%
rename from test/530-checker-lse-simd/expected.txt
rename to test/530-checker-lse-simd/expected-stdout.txt

test/530-checker-lse/Android.bp

diff --git a/test/530-checker-lse/Android.bp b/test/530-checker-lse/Android.bp
index 78edc59..82f0a79 100644
--- a/test/530-checker-lse/Android.bp
+++ b/test/530-checker-lse/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-lse-expected"],
+    data: [":art-run-test-530-checker-lse-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-lse-expected",
-    out: ["art-run-test-530-checker-lse-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-lse-expected-stdout",
+    out: ["art-run-test-530-checker-lse-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/530-checker-lse/expected-stdout.txt

diff --git a/test/530-checker-lse/expected.txt b/test/530-checker-lse/expected-stdout.txt
similarity index 100%
rename from test/530-checker-lse/expected.txt
rename to test/530-checker-lse/expected-stdout.txt

test/530-checker-lse2/Android.bp

diff --git a/test/530-checker-lse2/Android.bp b/test/530-checker-lse2/Android.bp
index fd0a483..e74b268 100644
--- a/test/530-checker-lse2/Android.bp
+++ b/test/530-checker-lse2/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-checker-lse2-expected"],
+    data: [":art-run-test-530-checker-lse2-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-checker-lse2-expected",
-    out: ["art-run-test-530-checker-lse2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-checker-lse2-expected-stdout",
+    out: ["art-run-test-530-checker-lse2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/530-checker-lse2/expected-stdout.txt

diff --git a/test/530-checker-lse2/expected.txt b/test/530-checker-lse2/expected-stdout.txt
similarity index 100%
rename from test/530-checker-lse2/expected.txt
rename to test/530-checker-lse2/expected-stdout.txt

test/530-checker-lse3/expected-stdout.txt

diff --git a/test/530-checker-lse3/expected.txt b/test/530-checker-lse3/expected-stdout.txt
similarity index 100%
rename from test/530-checker-lse3/expected.txt
rename to test/530-checker-lse3/expected-stdout.txt

test/530-checker-peel-unroll/expected-stdout.txt

diff --git a/test/530-checker-peel-unroll/expected.txt b/test/530-checker-peel-unroll/expected-stdout.txt
similarity index 100%
rename from test/530-checker-peel-unroll/expected.txt
rename to test/530-checker-peel-unroll/expected-stdout.txt

test/530-checker-regression-reftyp-final/expected-stdout.txt

diff --git a/test/530-checker-regression-reftyp-final/expected.txt b/test/530-checker-regression-reftyp-final/expected-stdout.txt
similarity index 100%
rename from test/530-checker-regression-reftyp-final/expected.txt
rename to test/530-checker-regression-reftyp-final/expected-stdout.txt

test/530-instanceof-checkcast/Android.bp

diff --git a/test/530-instanceof-checkcast/Android.bp b/test/530-instanceof-checkcast/Android.bp
index 077fda3..858a5af 100644
--- a/test/530-instanceof-checkcast/Android.bp
+++ b/test/530-instanceof-checkcast/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-instanceof-checkcast-expected"],
+    data: [":art-run-test-530-instanceof-checkcast-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-instanceof-checkcast-expected",
-    out: ["art-run-test-530-instanceof-checkcast-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-instanceof-checkcast-expected-stdout",
+    out: ["art-run-test-530-instanceof-checkcast-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/530-instanceof-checkcast/expected-stdout.txt

diff --git a/test/530-instanceof-checkcast/expected.txt b/test/530-instanceof-checkcast/expected-stdout.txt
similarity index 100%
rename from test/530-instanceof-checkcast/expected.txt
rename to test/530-instanceof-checkcast/expected-stdout.txt

test/530-regression-lse/Android.bp

diff --git a/test/530-regression-lse/Android.bp b/test/530-regression-lse/Android.bp
index 366ff33..e9c2d43 100644
--- a/test/530-regression-lse/Android.bp
+++ b/test/530-regression-lse/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-530-regression-lse-expected"],
+    data: [":art-run-test-530-regression-lse-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-530-regression-lse-expected",
-    out: ["art-run-test-530-regression-lse-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-530-regression-lse-expected-stdout",
+    out: ["art-run-test-530-regression-lse-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/530-regression-lse/expected-stdout.txt

diff --git a/test/530-regression-lse/expected.txt b/test/530-regression-lse/expected-stdout.txt
similarity index 100%
rename from test/530-regression-lse/expected.txt
rename to test/530-regression-lse/expected-stdout.txt

test/531-regression-debugphi/expected-stdout.txt

diff --git a/test/531-regression-debugphi/expected.txt b/test/531-regression-debugphi/expected-stdout.txt
similarity index 100%
rename from test/531-regression-debugphi/expected.txt
rename to test/531-regression-debugphi/expected-stdout.txt

test/532-checker-nonnull-arrayset/Android.bp

diff --git a/test/532-checker-nonnull-arrayset/Android.bp b/test/532-checker-nonnull-arrayset/Android.bp
index 28e67eb..b165e2a 100644
--- a/test/532-checker-nonnull-arrayset/Android.bp
+++ b/test/532-checker-nonnull-arrayset/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-532-checker-nonnull-arrayset-expected"],
+    data: [":art-run-test-532-checker-nonnull-arrayset-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-532-checker-nonnull-arrayset-expected",
-    out: ["art-run-test-532-checker-nonnull-arrayset-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-532-checker-nonnull-arrayset-expected-stdout",
+    out: ["art-run-test-532-checker-nonnull-arrayset-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/532-checker-nonnull-arrayset/expected-stdout.txt

diff --git a/test/532-checker-nonnull-arrayset/expected.txt b/test/532-checker-nonnull-arrayset/expected-stdout.txt
similarity index 100%
rename from test/532-checker-nonnull-arrayset/expected.txt
rename to test/532-checker-nonnull-arrayset/expected-stdout.txt

test/533-regression-debugphi/expected-stdout.txt

diff --git a/test/533-regression-debugphi/expected.txt b/test/533-regression-debugphi/expected-stdout.txt
similarity index 100%
rename from test/533-regression-debugphi/expected.txt
rename to test/533-regression-debugphi/expected-stdout.txt

test/534-checker-bce-deoptimization/Android.bp

diff --git a/test/534-checker-bce-deoptimization/Android.bp b/test/534-checker-bce-deoptimization/Android.bp
index f70803e..82c94a8 100644
--- a/test/534-checker-bce-deoptimization/Android.bp
+++ b/test/534-checker-bce-deoptimization/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-534-checker-bce-deoptimization-expected"],
+    data: [":art-run-test-534-checker-bce-deoptimization-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-534-checker-bce-deoptimization-expected",
-    out: ["art-run-test-534-checker-bce-deoptimization-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-534-checker-bce-deoptimization-expected-stdout",
+    out: ["art-run-test-534-checker-bce-deoptimization-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/534-checker-bce-deoptimization/expected-stdout.txt

diff --git a/test/534-checker-bce-deoptimization/expected.txt b/test/534-checker-bce-deoptimization/expected-stdout.txt
similarity index 100%
rename from test/534-checker-bce-deoptimization/expected.txt
rename to test/534-checker-bce-deoptimization/expected-stdout.txt

test/535-deopt-and-inlining/Android.bp

diff --git a/test/535-deopt-and-inlining/Android.bp b/test/535-deopt-and-inlining/Android.bp
index b85e6a5..e48d1a1 100644
--- a/test/535-deopt-and-inlining/Android.bp
+++ b/test/535-deopt-and-inlining/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-535-deopt-and-inlining-expected"],
+    data: [":art-run-test-535-deopt-and-inlining-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-535-deopt-and-inlining-expected",
-    out: ["art-run-test-535-deopt-and-inlining-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-535-deopt-and-inlining-expected-stdout",
+    out: ["art-run-test-535-deopt-and-inlining-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/535-deopt-and-inlining/expected-stdout.txt

diff --git a/test/535-deopt-and-inlining/expected.txt b/test/535-deopt-and-inlining/expected-stdout.txt
similarity index 100%
rename from test/535-deopt-and-inlining/expected.txt
rename to test/535-deopt-and-inlining/expected-stdout.txt

test/535-regression-const-val/expected-stdout.txt

diff --git a/test/535-regression-const-val/expected.txt b/test/535-regression-const-val/expected-stdout.txt
similarity index 100%
rename from test/535-regression-const-val/expected.txt
rename to test/535-regression-const-val/expected-stdout.txt

test/536-checker-intrinsic-optimization/Android.bp

diff --git a/test/536-checker-intrinsic-optimization/Android.bp b/test/536-checker-intrinsic-optimization/Android.bp
index 270170a..92079a9 100644
--- a/test/536-checker-intrinsic-optimization/Android.bp
+++ b/test/536-checker-intrinsic-optimization/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-536-checker-intrinsic-optimization-expected"],
+    data: [":art-run-test-536-checker-intrinsic-optimization-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-536-checker-intrinsic-optimization-expected",
-    out: ["art-run-test-536-checker-intrinsic-optimization-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-536-checker-intrinsic-optimization-expected-stdout",
+    out: ["art-run-test-536-checker-intrinsic-optimization-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/536-checker-intrinsic-optimization/expected-stdout.txt

diff --git a/test/536-checker-intrinsic-optimization/expected.txt b/test/536-checker-intrinsic-optimization/expected-stdout.txt
similarity index 100%
rename from test/536-checker-intrinsic-optimization/expected.txt
rename to test/536-checker-intrinsic-optimization/expected-stdout.txt

test/536-checker-needs-access-check/expected-stdout.txt

diff --git a/test/536-checker-needs-access-check/expected.txt b/test/536-checker-needs-access-check/expected-stdout.txt
similarity index 100%
rename from test/536-checker-needs-access-check/expected.txt
rename to test/536-checker-needs-access-check/expected-stdout.txt

test/537-checker-arraycopy/Android.bp

diff --git a/test/537-checker-arraycopy/Android.bp b/test/537-checker-arraycopy/Android.bp
index 19f454b..3b3fc68 100644
--- a/test/537-checker-arraycopy/Android.bp
+++ b/test/537-checker-arraycopy/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-537-checker-arraycopy-expected"],
+    data: [":art-run-test-537-checker-arraycopy-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-537-checker-arraycopy-expected",
-    out: ["art-run-test-537-checker-arraycopy-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-537-checker-arraycopy-expected-stdout",
+    out: ["art-run-test-537-checker-arraycopy-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/537-checker-arraycopy/expected-stdout.txt

diff --git a/test/537-checker-arraycopy/expected.txt b/test/537-checker-arraycopy/expected-stdout.txt
similarity index 100%
rename from test/537-checker-arraycopy/expected.txt
rename to test/537-checker-arraycopy/expected-stdout.txt

test/537-checker-debuggable/expected-stdout.txt

diff --git a/test/537-checker-debuggable/expected.txt b/test/537-checker-debuggable/expected-stdout.txt
similarity index 100%
rename from test/537-checker-debuggable/expected.txt
rename to test/537-checker-debuggable/expected-stdout.txt

test/537-checker-inline-and-unverified/expected-stdout.txt

diff --git a/test/537-checker-inline-and-unverified/expected.txt b/test/537-checker-inline-and-unverified/expected-stdout.txt
similarity index 100%
rename from test/537-checker-inline-and-unverified/expected.txt
rename to test/537-checker-inline-and-unverified/expected-stdout.txt

test/537-checker-jump-over-jump/Android.bp

diff --git a/test/537-checker-jump-over-jump/Android.bp b/test/537-checker-jump-over-jump/Android.bp
index 216a63a..6ab9bb5 100644
--- a/test/537-checker-jump-over-jump/Android.bp
+++ b/test/537-checker-jump-over-jump/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-537-checker-jump-over-jump-expected"],
+    data: [":art-run-test-537-checker-jump-over-jump-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-537-checker-jump-over-jump-expected",
-    out: ["art-run-test-537-checker-jump-over-jump-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-537-checker-jump-over-jump-expected-stdout",
+    out: ["art-run-test-537-checker-jump-over-jump-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/537-checker-jump-over-jump/expected-stdout.txt

diff --git a/test/537-checker-jump-over-jump/expected.txt b/test/537-checker-jump-over-jump/expected-stdout.txt
similarity index 100%
rename from test/537-checker-jump-over-jump/expected.txt
rename to test/537-checker-jump-over-jump/expected-stdout.txt

test/538-checker-embed-constants/Android.bp

diff --git a/test/538-checker-embed-constants/Android.bp b/test/538-checker-embed-constants/Android.bp
index 8f8daa6..97be862 100644
--- a/test/538-checker-embed-constants/Android.bp
+++ b/test/538-checker-embed-constants/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-538-checker-embed-constants-expected"],
+    data: [":art-run-test-538-checker-embed-constants-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-538-checker-embed-constants-expected",
-    out: ["art-run-test-538-checker-embed-constants-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-538-checker-embed-constants-expected-stdout",
+    out: ["art-run-test-538-checker-embed-constants-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/538-checker-embed-constants/expected-stdout.txt

diff --git a/test/538-checker-embed-constants/expected.txt b/test/538-checker-embed-constants/expected-stdout.txt
similarity index 100%
rename from test/538-checker-embed-constants/expected.txt
rename to test/538-checker-embed-constants/expected-stdout.txt

test/540-checker-rtp-bug/Android.bp

diff --git a/test/540-checker-rtp-bug/Android.bp b/test/540-checker-rtp-bug/Android.bp
index 086a83f..34b4550 100644
--- a/test/540-checker-rtp-bug/Android.bp
+++ b/test/540-checker-rtp-bug/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-540-checker-rtp-bug-expected"],
+    data: [":art-run-test-540-checker-rtp-bug-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-540-checker-rtp-bug-expected",
-    out: ["art-run-test-540-checker-rtp-bug-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-540-checker-rtp-bug-expected-stdout",
+    out: ["art-run-test-540-checker-rtp-bug-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/540-checker-rtp-bug/expected-stdout.txt

diff --git a/test/540-checker-rtp-bug/expected.txt b/test/540-checker-rtp-bug/expected-stdout.txt
similarity index 100%
rename from test/540-checker-rtp-bug/expected.txt
rename to test/540-checker-rtp-bug/expected-stdout.txt

test/541-regression-inlined-deopt/expected-stdout.txt

diff --git a/test/541-regression-inlined-deopt/expected.txt b/test/541-regression-inlined-deopt/expected-stdout.txt
similarity index 100%
rename from test/541-regression-inlined-deopt/expected.txt
rename to test/541-regression-inlined-deopt/expected-stdout.txt

test/542-bitfield-rotates/Android.bp

diff --git a/test/542-bitfield-rotates/Android.bp b/test/542-bitfield-rotates/Android.bp
index 51ec13a..c0f22fc 100644
--- a/test/542-bitfield-rotates/Android.bp
+++ b/test/542-bitfield-rotates/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-542-bitfield-rotates-expected"],
+    data: [":art-run-test-542-bitfield-rotates-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-542-bitfield-rotates-expected",
-    out: ["art-run-test-542-bitfield-rotates-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-542-bitfield-rotates-expected-stdout",
+    out: ["art-run-test-542-bitfield-rotates-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/542-bitfield-rotates/expected-stdout.txt

diff --git a/test/542-bitfield-rotates/expected.txt b/test/542-bitfield-rotates/expected-stdout.txt
similarity index 100%
rename from test/542-bitfield-rotates/expected.txt
rename to test/542-bitfield-rotates/expected-stdout.txt

test/542-inline-trycatch/Android.bp

diff --git a/test/542-inline-trycatch/Android.bp b/test/542-inline-trycatch/Android.bp
index 7c2eef7..a87d1da 100644
--- a/test/542-inline-trycatch/Android.bp
+++ b/test/542-inline-trycatch/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-542-inline-trycatch-expected"],
+    data: [":art-run-test-542-inline-trycatch-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-542-inline-trycatch-expected",
-    out: ["art-run-test-542-inline-trycatch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-542-inline-trycatch-expected-stdout",
+    out: ["art-run-test-542-inline-trycatch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/542-inline-trycatch/expected-stdout.txt

diff --git a/test/542-inline-trycatch/expected.txt b/test/542-inline-trycatch/expected-stdout.txt
similarity index 100%
rename from test/542-inline-trycatch/expected.txt
rename to test/542-inline-trycatch/expected-stdout.txt

test/542-unresolved-access-check/Android.bp

diff --git a/test/542-unresolved-access-check/Android.bp b/test/542-unresolved-access-check/Android.bp
index 7591019..8fcc49d 100644
--- a/test/542-unresolved-access-check/Android.bp
+++ b/test/542-unresolved-access-check/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-542-unresolved-access-check-expected"],
+    data: [":art-run-test-542-unresolved-access-check-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-542-unresolved-access-check-expected",
-    out: ["art-run-test-542-unresolved-access-check-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-542-unresolved-access-check-expected-stdout",
+    out: ["art-run-test-542-unresolved-access-check-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/542-unresolved-access-check/expected-stdout.txt

diff --git a/test/542-unresolved-access-check/expected.txt b/test/542-unresolved-access-check/expected-stdout.txt
similarity index 100%
rename from test/542-unresolved-access-check/expected.txt
rename to test/542-unresolved-access-check/expected-stdout.txt

test/543-checker-dce-trycatch/expected-stdout.txt

diff --git a/test/543-checker-dce-trycatch/expected.txt b/test/543-checker-dce-trycatch/expected-stdout.txt
similarity index 100%
rename from test/543-checker-dce-trycatch/expected.txt
rename to test/543-checker-dce-trycatch/expected-stdout.txt

test/543-env-long-ref/expected-stdout.txt

diff --git a/test/543-env-long-ref/expected.txt b/test/543-env-long-ref/expected-stdout.txt
similarity index 100%
rename from test/543-env-long-ref/expected.txt
rename to test/543-env-long-ref/expected-stdout.txt

test/545-tracing-and-jit/Android.bp

diff --git a/test/545-tracing-and-jit/Android.bp b/test/545-tracing-and-jit/Android.bp
index dc48e56..378459f 100644
--- a/test/545-tracing-and-jit/Android.bp
+++ b/test/545-tracing-and-jit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-545-tracing-and-jit-expected"],
+    data: [":art-run-test-545-tracing-and-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-545-tracing-and-jit-expected",
-    out: ["art-run-test-545-tracing-and-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-545-tracing-and-jit-expected-stdout",
+    out: ["art-run-test-545-tracing-and-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/545-tracing-and-jit/expected-stdout.txt

diff --git a/test/545-tracing-and-jit/expected.txt b/test/545-tracing-and-jit/expected-stdout.txt
similarity index 100%
rename from test/545-tracing-and-jit/expected.txt
rename to test/545-tracing-and-jit/expected-stdout.txt

test/546-regression-simplify-catch/expected-stdout.txt

diff --git a/test/546-regression-simplify-catch/expected.txt b/test/546-regression-simplify-catch/expected-stdout.txt
similarity index 100%
rename from test/546-regression-simplify-catch/expected.txt
rename to test/546-regression-simplify-catch/expected-stdout.txt

test/547-regression-trycatch-critic-edge/expected-stdout.txt

diff --git a/test/547-regression-trycatch-critic-edge/expected.txt b/test/547-regression-trycatch-critic-edge/expected-stdout.txt
similarity index 100%
rename from test/547-regression-trycatch-critic-edge/expected.txt
rename to test/547-regression-trycatch-critic-edge/expected-stdout.txt

test/548-checker-inlining-and-dce/Android.bp

diff --git a/test/548-checker-inlining-and-dce/Android.bp b/test/548-checker-inlining-and-dce/Android.bp
index 5d10329..66fa5a9 100644
--- a/test/548-checker-inlining-and-dce/Android.bp
+++ b/test/548-checker-inlining-and-dce/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-548-checker-inlining-and-dce-expected"],
+    data: [":art-run-test-548-checker-inlining-and-dce-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-548-checker-inlining-and-dce-expected",
-    out: ["art-run-test-548-checker-inlining-and-dce-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-548-checker-inlining-and-dce-expected-stdout",
+    out: ["art-run-test-548-checker-inlining-and-dce-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/548-checker-inlining-and-dce/expected-stdout.txt

diff --git a/test/548-checker-inlining-and-dce/expected.txt b/test/548-checker-inlining-and-dce/expected-stdout.txt
similarity index 100%
rename from test/548-checker-inlining-and-dce/expected.txt
rename to test/548-checker-inlining-and-dce/expected-stdout.txt

test/549-checker-types-merge/Android.bp

diff --git a/test/549-checker-types-merge/Android.bp b/test/549-checker-types-merge/Android.bp
index 1735c46..7673fb5 100644
--- a/test/549-checker-types-merge/Android.bp
+++ b/test/549-checker-types-merge/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-549-checker-types-merge-expected"],
+    data: [":art-run-test-549-checker-types-merge-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-549-checker-types-merge-expected",
-    out: ["art-run-test-549-checker-types-merge-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-549-checker-types-merge-expected-stdout",
+    out: ["art-run-test-549-checker-types-merge-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/549-checker-types-merge/expected-stdout.txt

diff --git a/test/549-checker-types-merge/expected.txt b/test/549-checker-types-merge/expected-stdout.txt
similarity index 100%
rename from test/549-checker-types-merge/expected.txt
rename to test/549-checker-types-merge/expected-stdout.txt

test/550-checker-multiply-accumulate/Android.bp

diff --git a/test/550-checker-multiply-accumulate/Android.bp b/test/550-checker-multiply-accumulate/Android.bp
index 5b12522..149872c 100644
--- a/test/550-checker-multiply-accumulate/Android.bp
+++ b/test/550-checker-multiply-accumulate/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-550-checker-multiply-accumulate-expected"],
+    data: [":art-run-test-550-checker-multiply-accumulate-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-550-checker-multiply-accumulate-expected",
-    out: ["art-run-test-550-checker-multiply-accumulate-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-550-checker-multiply-accumulate-expected-stdout",
+    out: ["art-run-test-550-checker-multiply-accumulate-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/550-checker-multiply-accumulate/expected-stdout.txt

diff --git a/test/550-checker-multiply-accumulate/expected.txt b/test/550-checker-multiply-accumulate/expected-stdout.txt
similarity index 100%
rename from test/550-checker-multiply-accumulate/expected.txt
rename to test/550-checker-multiply-accumulate/expected-stdout.txt

test/550-checker-regression-wide-store/expected-stdout.txt

diff --git a/test/550-checker-regression-wide-store/expected.txt b/test/550-checker-regression-wide-store/expected-stdout.txt
similarity index 100%
rename from test/550-checker-regression-wide-store/expected.txt
rename to test/550-checker-regression-wide-store/expected-stdout.txt

test/550-new-instance-clinit/Android.bp

diff --git a/test/550-new-instance-clinit/Android.bp b/test/550-new-instance-clinit/Android.bp
index 6892cba..edd6bbe 100644
--- a/test/550-new-instance-clinit/Android.bp
+++ b/test/550-new-instance-clinit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-550-new-instance-clinit-expected"],
+    data: [":art-run-test-550-new-instance-clinit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-550-new-instance-clinit-expected",
-    out: ["art-run-test-550-new-instance-clinit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-550-new-instance-clinit-expected-stdout",
+    out: ["art-run-test-550-new-instance-clinit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/550-new-instance-clinit/expected-stdout.txt

diff --git a/test/550-new-instance-clinit/expected.txt b/test/550-new-instance-clinit/expected-stdout.txt
similarity index 100%
rename from test/550-new-instance-clinit/expected.txt
rename to test/550-new-instance-clinit/expected-stdout.txt

test/551-checker-clinit/Android.bp

diff --git a/test/551-checker-clinit/Android.bp b/test/551-checker-clinit/Android.bp
index 6098755..14ec30e 100644
--- a/test/551-checker-clinit/Android.bp
+++ b/test/551-checker-clinit/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-551-checker-clinit-expected"],
+    data: [":art-run-test-551-checker-clinit-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-551-checker-clinit-expected",
-    out: ["art-run-test-551-checker-clinit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-551-checker-clinit-expected-stdout",
+    out: ["art-run-test-551-checker-clinit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/551-checker-clinit/expected-stdout.txt

diff --git a/test/551-checker-clinit/expected.txt b/test/551-checker-clinit/expected-stdout.txt
similarity index 100%
rename from test/551-checker-clinit/expected.txt
rename to test/551-checker-clinit/expected-stdout.txt

test/551-checker-shifter-operand/Android.bp

diff --git a/test/551-checker-shifter-operand/Android.bp b/test/551-checker-shifter-operand/Android.bp
index 6d11478..a68f861 100644
--- a/test/551-checker-shifter-operand/Android.bp
+++ b/test/551-checker-shifter-operand/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-551-checker-shifter-operand-expected"],
+    data: [":art-run-test-551-checker-shifter-operand-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-551-checker-shifter-operand-expected",
-    out: ["art-run-test-551-checker-shifter-operand-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-551-checker-shifter-operand-expected-stdout",
+    out: ["art-run-test-551-checker-shifter-operand-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/551-checker-shifter-operand/expected-stdout.txt

diff --git a/test/551-checker-shifter-operand/expected.txt b/test/551-checker-shifter-operand/expected-stdout.txt
similarity index 100%
rename from test/551-checker-shifter-operand/expected.txt
rename to test/551-checker-shifter-operand/expected-stdout.txt

test/551-implicit-null-checks/Android.bp

diff --git a/test/551-implicit-null-checks/Android.bp b/test/551-implicit-null-checks/Android.bp
index 3eac784..48e3ffe 100644
--- a/test/551-implicit-null-checks/Android.bp
+++ b/test/551-implicit-null-checks/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-551-implicit-null-checks-expected"],
+    data: [":art-run-test-551-implicit-null-checks-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-551-implicit-null-checks-expected",
-    out: ["art-run-test-551-implicit-null-checks-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-551-implicit-null-checks-expected-stdout",
+    out: ["art-run-test-551-implicit-null-checks-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/551-implicit-null-checks/expected-stdout.txt

diff --git a/test/551-implicit-null-checks/expected.txt b/test/551-implicit-null-checks/expected-stdout.txt
similarity index 100%
rename from test/551-implicit-null-checks/expected.txt
rename to test/551-implicit-null-checks/expected-stdout.txt

test/551-invoke-super/expected-stdout.txt

diff --git a/test/551-invoke-super/expected.txt b/test/551-invoke-super/expected-stdout.txt
similarity index 100%
rename from test/551-invoke-super/expected.txt
rename to test/551-invoke-super/expected-stdout.txt

test/552-checker-primitive-typeprop/expected-stdout.txt

diff --git a/test/552-checker-primitive-typeprop/expected.txt b/test/552-checker-primitive-typeprop/expected-stdout.txt
similarity index 100%
rename from test/552-checker-primitive-typeprop/expected.txt
rename to test/552-checker-primitive-typeprop/expected-stdout.txt

test/552-checker-sharpening/Android.bp

diff --git a/test/552-checker-sharpening/Android.bp b/test/552-checker-sharpening/Android.bp
index d02a611..66658ec 100644
--- a/test/552-checker-sharpening/Android.bp
+++ b/test/552-checker-sharpening/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-552-checker-sharpening-expected"],
+    data: [":art-run-test-552-checker-sharpening-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-552-checker-sharpening-expected",
-    out: ["art-run-test-552-checker-sharpening-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-552-checker-sharpening-expected-stdout",
+    out: ["art-run-test-552-checker-sharpening-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/552-checker-sharpening/expected-stdout.txt

diff --git a/test/552-checker-sharpening/expected.txt b/test/552-checker-sharpening/expected-stdout.txt
similarity index 100%
rename from test/552-checker-sharpening/expected.txt
rename to test/552-checker-sharpening/expected-stdout.txt

test/552-checker-x86-avx2-bit-manipulation/Android.bp

diff --git a/test/552-checker-x86-avx2-bit-manipulation/Android.bp b/test/552-checker-x86-avx2-bit-manipulation/Android.bp
index a7261a2..dc7f092 100644
--- a/test/552-checker-x86-avx2-bit-manipulation/Android.bp
+++ b/test/552-checker-x86-avx2-bit-manipulation/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-552-checker-x86-avx2-bit-manipulation-expected"],
+    data: [":art-run-test-552-checker-x86-avx2-bit-manipulation-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-552-checker-x86-avx2-bit-manipulation-expected",
-    out: ["art-run-test-552-checker-x86-avx2-bit-manipulation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-552-checker-x86-avx2-bit-manipulation-expected-stdout",
+    out: ["art-run-test-552-checker-x86-avx2-bit-manipulation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/552-checker-x86-avx2-bit-manipulation/expected-stdout.txt

diff --git a/test/552-checker-x86-avx2-bit-manipulation/expected.txt b/test/552-checker-x86-avx2-bit-manipulation/expected-stdout.txt
similarity index 100%
rename from test/552-checker-x86-avx2-bit-manipulation/expected.txt
rename to test/552-checker-x86-avx2-bit-manipulation/expected-stdout.txt

test/552-invoke-non-existent-super/expected-stdout.txt

diff --git a/test/552-invoke-non-existent-super/expected.txt b/test/552-invoke-non-existent-super/expected-stdout.txt
similarity index 100%
rename from test/552-invoke-non-existent-super/expected.txt
rename to test/552-invoke-non-existent-super/expected-stdout.txt

test/553-invoke-super/expected-stdout.txt

diff --git a/test/553-invoke-super/expected.txt b/test/553-invoke-super/expected-stdout.txt
similarity index 100%
rename from test/553-invoke-super/expected.txt
rename to test/553-invoke-super/expected-stdout.txt

test/554-checker-rtp-checkcast/Android.bp

diff --git a/test/554-checker-rtp-checkcast/Android.bp b/test/554-checker-rtp-checkcast/Android.bp
index 6dc0a18..49038fb 100644
--- a/test/554-checker-rtp-checkcast/Android.bp
+++ b/test/554-checker-rtp-checkcast/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-554-checker-rtp-checkcast-expected"],
+    data: [":art-run-test-554-checker-rtp-checkcast-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-554-checker-rtp-checkcast-expected",
-    out: ["art-run-test-554-checker-rtp-checkcast-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-554-checker-rtp-checkcast-expected-stdout",
+    out: ["art-run-test-554-checker-rtp-checkcast-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/554-checker-rtp-checkcast/expected-stdout.txt

diff --git a/test/554-checker-rtp-checkcast/expected.txt b/test/554-checker-rtp-checkcast/expected-stdout.txt
similarity index 100%
rename from test/554-checker-rtp-checkcast/expected.txt
rename to test/554-checker-rtp-checkcast/expected-stdout.txt

test/555-UnsafeGetLong-regression/Android.bp

diff --git a/test/555-UnsafeGetLong-regression/Android.bp b/test/555-UnsafeGetLong-regression/Android.bp
index 83c5ee6..89072af 100644
--- a/test/555-UnsafeGetLong-regression/Android.bp
+++ b/test/555-UnsafeGetLong-regression/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-555-UnsafeGetLong-regression-expected"],
+    data: [":art-run-test-555-UnsafeGetLong-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-555-UnsafeGetLong-regression-expected",
-    out: ["art-run-test-555-UnsafeGetLong-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-555-UnsafeGetLong-regression-expected-stdout",
+    out: ["art-run-test-555-UnsafeGetLong-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/555-UnsafeGetLong-regression/expected-stdout.txt

diff --git a/test/555-UnsafeGetLong-regression/expected.txt b/test/555-UnsafeGetLong-regression/expected-stdout.txt
similarity index 100%
rename from test/555-UnsafeGetLong-regression/expected.txt
rename to test/555-UnsafeGetLong-regression/expected-stdout.txt

test/556-invoke-super/expected-stdout.txt

diff --git a/test/556-invoke-super/expected.txt b/test/556-invoke-super/expected-stdout.txt
similarity index 100%
rename from test/556-invoke-super/expected.txt
rename to test/556-invoke-super/expected-stdout.txt

test/557-checker-instruct-simplifier-ror/Android.bp

diff --git a/test/557-checker-instruct-simplifier-ror/Android.bp b/test/557-checker-instruct-simplifier-ror/Android.bp
index 2a38fd0..24b3747 100644
--- a/test/557-checker-instruct-simplifier-ror/Android.bp
+++ b/test/557-checker-instruct-simplifier-ror/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-557-checker-instruct-simplifier-ror-expected"],
+    data: [":art-run-test-557-checker-instruct-simplifier-ror-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-557-checker-instruct-simplifier-ror-expected",
-    out: ["art-run-test-557-checker-instruct-simplifier-ror-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-557-checker-instruct-simplifier-ror-expected-stdout",
+    out: ["art-run-test-557-checker-instruct-simplifier-ror-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/557-checker-instruct-simplifier-ror/expected-stdout.txt

diff --git a/test/557-checker-instruct-simplifier-ror/expected.txt b/test/557-checker-instruct-simplifier-ror/expected-stdout.txt
similarity index 100%
rename from test/557-checker-instruct-simplifier-ror/expected.txt
rename to test/557-checker-instruct-simplifier-ror/expected-stdout.txt

test/557-checker-ref-equivalent/expected-stdout.txt

diff --git a/test/557-checker-ref-equivalent/expected.txt b/test/557-checker-ref-equivalent/expected-stdout.txt
similarity index 100%
rename from test/557-checker-ref-equivalent/expected.txt
rename to test/557-checker-ref-equivalent/expected-stdout.txt

test/558-switch/Android.bp

diff --git a/test/558-switch/Android.bp b/test/558-switch/Android.bp
index 78f5fe6..2bcacb0 100644
--- a/test/558-switch/Android.bp
+++ b/test/558-switch/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-558-switch-expected"],
+    data: [":art-run-test-558-switch-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-558-switch-expected",
-    out: ["art-run-test-558-switch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-558-switch-expected-stdout",
+    out: ["art-run-test-558-switch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/558-switch/expected-stdout.txt

diff --git a/test/558-switch/expected.txt b/test/558-switch/expected-stdout.txt
similarity index 100%
rename from test/558-switch/expected.txt
rename to test/558-switch/expected-stdout.txt

test/559-bce-ssa/Android.bp

diff --git a/test/559-bce-ssa/Android.bp b/test/559-bce-ssa/Android.bp
index f806827..3921fbf 100644
--- a/test/559-bce-ssa/Android.bp
+++ b/test/559-bce-ssa/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-559-bce-ssa-expected"],
+    data: [":art-run-test-559-bce-ssa-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-559-bce-ssa-expected",
-    out: ["art-run-test-559-bce-ssa-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-559-bce-ssa-expected-stdout",
+    out: ["art-run-test-559-bce-ssa-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/559-bce-ssa/expected-stdout.txt

diff --git a/test/559-bce-ssa/expected.txt b/test/559-bce-ssa/expected-stdout.txt
similarity index 100%
rename from test/559-bce-ssa/expected.txt
rename to test/559-bce-ssa/expected-stdout.txt

test/559-checker-irreducible-loop/expected-stdout.txt

diff --git a/test/559-checker-irreducible-loop/expected.txt b/test/559-checker-irreducible-loop/expected-stdout.txt
similarity index 100%
rename from test/559-checker-irreducible-loop/expected.txt
rename to test/559-checker-irreducible-loop/expected-stdout.txt

test/559-checker-rtp-ifnotnull/Android.bp

diff --git a/test/559-checker-rtp-ifnotnull/Android.bp b/test/559-checker-rtp-ifnotnull/Android.bp
index 3ba9d3b..7a61169 100644
--- a/test/559-checker-rtp-ifnotnull/Android.bp
+++ b/test/559-checker-rtp-ifnotnull/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-559-checker-rtp-ifnotnull-expected"],
+    data: [":art-run-test-559-checker-rtp-ifnotnull-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-559-checker-rtp-ifnotnull-expected",
-    out: ["art-run-test-559-checker-rtp-ifnotnull-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-559-checker-rtp-ifnotnull-expected-stdout",
+    out: ["art-run-test-559-checker-rtp-ifnotnull-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/559-checker-rtp-ifnotnull/expected-stdout.txt

diff --git a/test/559-checker-rtp-ifnotnull/expected.txt b/test/559-checker-rtp-ifnotnull/expected-stdout.txt
similarity index 100%
rename from test/559-checker-rtp-ifnotnull/expected.txt
rename to test/559-checker-rtp-ifnotnull/expected-stdout.txt

test/560-packed-switch/Android.bp

diff --git a/test/560-packed-switch/Android.bp b/test/560-packed-switch/Android.bp
index 1a14037..125535e 100644
--- a/test/560-packed-switch/Android.bp
+++ b/test/560-packed-switch/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-560-packed-switch-expected"],
+    data: [":art-run-test-560-packed-switch-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-560-packed-switch-expected",
-    out: ["art-run-test-560-packed-switch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-560-packed-switch-expected-stdout",
+    out: ["art-run-test-560-packed-switch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/560-packed-switch/expected-stdout.txt

diff --git a/test/560-packed-switch/expected.txt b/test/560-packed-switch/expected-stdout.txt
similarity index 100%
rename from test/560-packed-switch/expected.txt
rename to test/560-packed-switch/expected-stdout.txt

test/561-divrem/Android.bp

diff --git a/test/561-divrem/Android.bp b/test/561-divrem/Android.bp
index d168c71..9555807 100644
--- a/test/561-divrem/Android.bp
+++ b/test/561-divrem/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-561-divrem-expected"],
+    data: [":art-run-test-561-divrem-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-561-divrem-expected",
-    out: ["art-run-test-561-divrem-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-561-divrem-expected-stdout",
+    out: ["art-run-test-561-divrem-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/561-divrem/expected-stdout.txt

diff --git a/test/561-divrem/expected.txt b/test/561-divrem/expected-stdout.txt
similarity index 100%
rename from test/561-divrem/expected.txt
rename to test/561-divrem/expected-stdout.txt

test/561-shared-slowpaths/Android.bp

diff --git a/test/561-shared-slowpaths/Android.bp b/test/561-shared-slowpaths/Android.bp
index be070ab..b0029cd 100644
--- a/test/561-shared-slowpaths/Android.bp
+++ b/test/561-shared-slowpaths/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-561-shared-slowpaths-expected"],
+    data: [":art-run-test-561-shared-slowpaths-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-561-shared-slowpaths-expected",
-    out: ["art-run-test-561-shared-slowpaths-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-561-shared-slowpaths-expected-stdout",
+    out: ["art-run-test-561-shared-slowpaths-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/561-shared-slowpaths/expected-stdout.txt

diff --git a/test/561-shared-slowpaths/expected.txt b/test/561-shared-slowpaths/expected-stdout.txt
similarity index 100%
rename from test/561-shared-slowpaths/expected.txt
rename to test/561-shared-slowpaths/expected-stdout.txt

test/562-bce-preheader/Android.bp

diff --git a/test/562-bce-preheader/Android.bp b/test/562-bce-preheader/Android.bp
index 13c0f36..dd129ab 100644
--- a/test/562-bce-preheader/Android.bp
+++ b/test/562-bce-preheader/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-562-bce-preheader-expected"],
+    data: [":art-run-test-562-bce-preheader-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-562-bce-preheader-expected",
-    out: ["art-run-test-562-bce-preheader-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-562-bce-preheader-expected-stdout",
+    out: ["art-run-test-562-bce-preheader-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/562-bce-preheader/expected-stdout.txt

diff --git a/test/562-bce-preheader/expected.txt b/test/562-bce-preheader/expected-stdout.txt
similarity index 100%
rename from test/562-bce-preheader/expected.txt
rename to test/562-bce-preheader/expected-stdout.txt

test/562-checker-no-intermediate/Android.bp

diff --git a/test/562-checker-no-intermediate/Android.bp b/test/562-checker-no-intermediate/Android.bp
index b0c2e3c..bf68dcb 100644
--- a/test/562-checker-no-intermediate/Android.bp
+++ b/test/562-checker-no-intermediate/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-562-checker-no-intermediate-expected"],
+    data: [":art-run-test-562-checker-no-intermediate-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-562-checker-no-intermediate-expected",
-    out: ["art-run-test-562-checker-no-intermediate-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-562-checker-no-intermediate-expected-stdout",
+    out: ["art-run-test-562-checker-no-intermediate-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/562-checker-no-intermediate/expected-stdout.txt

diff --git a/test/562-checker-no-intermediate/expected.txt b/test/562-checker-no-intermediate/expected-stdout.txt
similarity index 100%
rename from test/562-checker-no-intermediate/expected.txt
rename to test/562-checker-no-intermediate/expected-stdout.txt

test/563-checker-fakestring/expected-stdout.txt

diff --git a/test/563-checker-fakestring/expected.txt b/test/563-checker-fakestring/expected-stdout.txt
similarity index 100%
rename from test/563-checker-fakestring/expected.txt
rename to test/563-checker-fakestring/expected-stdout.txt

test/563-checker-invoke-super/Android.bp

diff --git a/test/563-checker-invoke-super/Android.bp b/test/563-checker-invoke-super/Android.bp
index 2963269..ff38836 100644
--- a/test/563-checker-invoke-super/Android.bp
+++ b/test/563-checker-invoke-super/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-563-checker-invoke-super-expected"],
+    data: [":art-run-test-563-checker-invoke-super-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-563-checker-invoke-super-expected",
-    out: ["art-run-test-563-checker-invoke-super-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-563-checker-invoke-super-expected-stdout",
+    out: ["art-run-test-563-checker-invoke-super-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/563-checker-invoke-super/expected-stdout.txt

diff --git a/test/563-checker-invoke-super/expected.txt b/test/563-checker-invoke-super/expected-stdout.txt
similarity index 100%
rename from test/563-checker-invoke-super/expected.txt
rename to test/563-checker-invoke-super/expected-stdout.txt

test/564-checker-bitcount/Android.bp

diff --git a/test/564-checker-bitcount/Android.bp b/test/564-checker-bitcount/Android.bp
index afd0915..0dad882 100644
--- a/test/564-checker-bitcount/Android.bp
+++ b/test/564-checker-bitcount/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-564-checker-bitcount-expected"],
+    data: [":art-run-test-564-checker-bitcount-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-564-checker-bitcount-expected",
-    out: ["art-run-test-564-checker-bitcount-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-564-checker-bitcount-expected-stdout",
+    out: ["art-run-test-564-checker-bitcount-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/564-checker-bitcount/expected-stdout.txt

diff --git a/test/564-checker-bitcount/expected.txt b/test/564-checker-bitcount/expected-stdout.txt
similarity index 100%
rename from test/564-checker-bitcount/expected.txt
rename to test/564-checker-bitcount/expected-stdout.txt

test/564-checker-inline-loop/Android.bp

diff --git a/test/564-checker-inline-loop/Android.bp b/test/564-checker-inline-loop/Android.bp
index cd5cac1..1b0a377 100644
--- a/test/564-checker-inline-loop/Android.bp
+++ b/test/564-checker-inline-loop/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-564-checker-inline-loop-expected"],
+    data: [":art-run-test-564-checker-inline-loop-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-564-checker-inline-loop-expected",
-    out: ["art-run-test-564-checker-inline-loop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-564-checker-inline-loop-expected-stdout",
+    out: ["art-run-test-564-checker-inline-loop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/564-checker-inline-loop/expected-stdout.txt

diff --git a/test/564-checker-inline-loop/expected.txt b/test/564-checker-inline-loop/expected-stdout.txt
similarity index 100%
rename from test/564-checker-inline-loop/expected.txt
rename to test/564-checker-inline-loop/expected-stdout.txt

test/564-checker-irreducible-loop/expected-stdout.txt

diff --git a/test/564-checker-irreducible-loop/expected.txt b/test/564-checker-irreducible-loop/expected-stdout.txt
similarity index 100%
rename from test/564-checker-irreducible-loop/expected.txt
rename to test/564-checker-irreducible-loop/expected-stdout.txt

test/564-checker-negbitwise/Android.bp

diff --git a/test/564-checker-negbitwise/Android.bp b/test/564-checker-negbitwise/Android.bp
index 872e5e9..55749ee 100644
--- a/test/564-checker-negbitwise/Android.bp
+++ b/test/564-checker-negbitwise/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-564-checker-negbitwise-expected"],
+    data: [":art-run-test-564-checker-negbitwise-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-564-checker-negbitwise-expected",
-    out: ["art-run-test-564-checker-negbitwise-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-564-checker-negbitwise-expected-stdout",
+    out: ["art-run-test-564-checker-negbitwise-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/564-checker-negbitwise/expected-stdout.txt

diff --git a/test/564-checker-negbitwise/expected.txt b/test/564-checker-negbitwise/expected-stdout.txt
similarity index 100%
rename from test/564-checker-negbitwise/expected.txt
rename to test/564-checker-negbitwise/expected-stdout.txt

test/565-checker-condition-liveness/Android.bp

diff --git a/test/565-checker-condition-liveness/Android.bp b/test/565-checker-condition-liveness/Android.bp
index 4cd4aec..1d1c0ee 100644
--- a/test/565-checker-condition-liveness/Android.bp
+++ b/test/565-checker-condition-liveness/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-565-checker-condition-liveness-expected"],
+    data: [":art-run-test-565-checker-condition-liveness-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-565-checker-condition-liveness-expected",
-    out: ["art-run-test-565-checker-condition-liveness-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-565-checker-condition-liveness-expected-stdout",
+    out: ["art-run-test-565-checker-condition-liveness-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/565-checker-condition-liveness/expected-stdout.txt

diff --git a/test/565-checker-condition-liveness/expected.txt b/test/565-checker-condition-liveness/expected-stdout.txt
similarity index 100%
rename from test/565-checker-condition-liveness/expected.txt
rename to test/565-checker-condition-liveness/expected-stdout.txt

test/565-checker-doublenegbitwise/expected-stdout.txt

diff --git a/test/565-checker-doublenegbitwise/expected.txt b/test/565-checker-doublenegbitwise/expected-stdout.txt
similarity index 100%
rename from test/565-checker-doublenegbitwise/expected.txt
rename to test/565-checker-doublenegbitwise/expected-stdout.txt

test/565-checker-irreducible-loop/expected-stdout.txt

diff --git a/test/565-checker-irreducible-loop/expected.txt b/test/565-checker-irreducible-loop/expected-stdout.txt
similarity index 100%
rename from test/565-checker-irreducible-loop/expected.txt
rename to test/565-checker-irreducible-loop/expected-stdout.txt

test/566-checker-codegen-select/Android.bp

diff --git a/test/566-checker-codegen-select/Android.bp b/test/566-checker-codegen-select/Android.bp
index b174117..1bd641e 100644
--- a/test/566-checker-codegen-select/Android.bp
+++ b/test/566-checker-codegen-select/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-566-checker-codegen-select-expected"],
+    data: [":art-run-test-566-checker-codegen-select-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-566-checker-codegen-select-expected",
-    out: ["art-run-test-566-checker-codegen-select-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-566-checker-codegen-select-expected-stdout",
+    out: ["art-run-test-566-checker-codegen-select-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/566-checker-codegen-select/expected-stdout.txt

diff --git a/test/566-checker-codegen-select/expected.txt b/test/566-checker-codegen-select/expected-stdout.txt
similarity index 100%
rename from test/566-checker-codegen-select/expected.txt
rename to test/566-checker-codegen-select/expected-stdout.txt

test/566-polymorphic-inlining/Android.bp

diff --git a/test/566-polymorphic-inlining/Android.bp b/test/566-polymorphic-inlining/Android.bp
index 20f9916..0c118af 100644
--- a/test/566-polymorphic-inlining/Android.bp
+++ b/test/566-polymorphic-inlining/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-566-polymorphic-inlining-expected"],
+    data: [":art-run-test-566-polymorphic-inlining-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-566-polymorphic-inlining-expected",
-    out: ["art-run-test-566-polymorphic-inlining-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-566-polymorphic-inlining-expected-stdout",
+    out: ["art-run-test-566-polymorphic-inlining-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/566-polymorphic-inlining/expected-stdout.txt

diff --git a/test/566-polymorphic-inlining/expected.txt b/test/566-polymorphic-inlining/expected-stdout.txt
similarity index 100%
rename from test/566-polymorphic-inlining/expected.txt
rename to test/566-polymorphic-inlining/expected-stdout.txt

test/567-checker-builder-intrinsics/Android.bp

diff --git a/test/567-checker-builder-intrinsics/Android.bp b/test/567-checker-builder-intrinsics/Android.bp
index c3cbf27..7a2c01d 100644
--- a/test/567-checker-builder-intrinsics/Android.bp
+++ b/test/567-checker-builder-intrinsics/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-567-checker-builder-intrinsics-expected"],
+    data: [":art-run-test-567-checker-builder-intrinsics-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-567-checker-builder-intrinsics-expected",
-    out: ["art-run-test-567-checker-builder-intrinsics-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-567-checker-builder-intrinsics-expected-stdout",
+    out: ["art-run-test-567-checker-builder-intrinsics-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/567-checker-builder-intrinsics/expected-stdout.txt

diff --git a/test/567-checker-builder-intrinsics/expected.txt b/test/567-checker-builder-intrinsics/expected-stdout.txt
similarity index 100%
rename from test/567-checker-builder-intrinsics/expected.txt
rename to test/567-checker-builder-intrinsics/expected-stdout.txt

test/568-checker-onebit/Android.bp

diff --git a/test/568-checker-onebit/Android.bp b/test/568-checker-onebit/Android.bp
index be73bc1..87b95a7 100644
--- a/test/568-checker-onebit/Android.bp
+++ b/test/568-checker-onebit/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-568-checker-onebit-expected"],
+    data: [":art-run-test-568-checker-onebit-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-568-checker-onebit-expected",
-    out: ["art-run-test-568-checker-onebit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-568-checker-onebit-expected-stdout",
+    out: ["art-run-test-568-checker-onebit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/568-checker-onebit/expected-stdout.txt

diff --git a/test/568-checker-onebit/expected.txt b/test/568-checker-onebit/expected-stdout.txt
similarity index 100%
rename from test/568-checker-onebit/expected.txt
rename to test/568-checker-onebit/expected-stdout.txt

test/569-checker-pattern-replacement/expected-stdout.txt

diff --git a/test/569-checker-pattern-replacement/expected.txt b/test/569-checker-pattern-replacement/expected-stdout.txt
similarity index 100%
rename from test/569-checker-pattern-replacement/expected.txt
rename to test/569-checker-pattern-replacement/expected-stdout.txt

test/570-checker-osr-locals/expected-stdout.txt

diff --git a/test/570-checker-osr-locals/expected.txt b/test/570-checker-osr-locals/expected-stdout.txt
similarity index 100%
rename from test/570-checker-osr-locals/expected.txt
rename to test/570-checker-osr-locals/expected-stdout.txt

test/570-checker-osr/expected-stdout.txt

diff --git a/test/570-checker-osr/expected.txt b/test/570-checker-osr/expected-stdout.txt
similarity index 100%
rename from test/570-checker-osr/expected.txt
rename to test/570-checker-osr/expected-stdout.txt

test/570-checker-select/Android.bp

diff --git a/test/570-checker-select/Android.bp b/test/570-checker-select/Android.bp
index 4b9a58e..0c1bbf9 100644
--- a/test/570-checker-select/Android.bp
+++ b/test/570-checker-select/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-570-checker-select-expected"],
+    data: [":art-run-test-570-checker-select-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-570-checker-select-expected",
-    out: ["art-run-test-570-checker-select-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-570-checker-select-expected-stdout",
+    out: ["art-run-test-570-checker-select-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/570-checker-select/expected-stdout.txt

diff --git a/test/570-checker-select/expected.txt b/test/570-checker-select/expected-stdout.txt
similarity index 100%
rename from test/570-checker-select/expected.txt
rename to test/570-checker-select/expected-stdout.txt

test/571-irreducible-loop/expected-stdout.txt

diff --git a/test/571-irreducible-loop/expected.txt b/test/571-irreducible-loop/expected-stdout.txt
similarity index 100%
rename from test/571-irreducible-loop/expected.txt
rename to test/571-irreducible-loop/expected-stdout.txt

test/572-checker-array-get-regression/Android.bp

diff --git a/test/572-checker-array-get-regression/Android.bp b/test/572-checker-array-get-regression/Android.bp
index 68d561e..e6564d5 100644
--- a/test/572-checker-array-get-regression/Android.bp
+++ b/test/572-checker-array-get-regression/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-572-checker-array-get-regression-expected"],
+    data: [":art-run-test-572-checker-array-get-regression-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-572-checker-array-get-regression-expected",
-    out: ["art-run-test-572-checker-array-get-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-572-checker-array-get-regression-expected-stdout",
+    out: ["art-run-test-572-checker-array-get-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/572-checker-array-get-regression/expected-stdout.txt

diff --git a/test/572-checker-array-get-regression/expected.txt b/test/572-checker-array-get-regression/expected-stdout.txt
similarity index 100%
rename from test/572-checker-array-get-regression/expected.txt
rename to test/572-checker-array-get-regression/expected-stdout.txt

test/573-checker-checkcast-regression/Android.bp

diff --git a/test/573-checker-checkcast-regression/Android.bp b/test/573-checker-checkcast-regression/Android.bp
index 35d41aa..61ea46e 100644
--- a/test/573-checker-checkcast-regression/Android.bp
+++ b/test/573-checker-checkcast-regression/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-573-checker-checkcast-regression-expected"],
+    data: [":art-run-test-573-checker-checkcast-regression-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-573-checker-checkcast-regression-expected",
-    out: ["art-run-test-573-checker-checkcast-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-573-checker-checkcast-regression-expected-stdout",
+    out: ["art-run-test-573-checker-checkcast-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/573-checker-checkcast-regression/expected-stdout.txt

diff --git a/test/573-checker-checkcast-regression/expected.txt b/test/573-checker-checkcast-regression/expected-stdout.txt
similarity index 100%
rename from test/573-checker-checkcast-regression/expected.txt
rename to test/573-checker-checkcast-regression/expected-stdout.txt

test/574-irreducible-and-constant-area/expected-stdout.txt

diff --git a/test/574-irreducible-and-constant-area/expected.txt b/test/574-irreducible-and-constant-area/expected-stdout.txt
similarity index 100%
rename from test/574-irreducible-and-constant-area/expected.txt
rename to test/574-irreducible-and-constant-area/expected-stdout.txt

test/575-checker-string-init-alias/expected-stdout.txt

diff --git a/test/575-checker-string-init-alias/expected.txt b/test/575-checker-string-init-alias/expected-stdout.txt
similarity index 100%
rename from test/575-checker-string-init-alias/expected.txt
rename to test/575-checker-string-init-alias/expected-stdout.txt

test/576-polymorphic-inlining/Android.bp

diff --git a/test/576-polymorphic-inlining/Android.bp b/test/576-polymorphic-inlining/Android.bp
index ec925c5..cfeff29 100644
--- a/test/576-polymorphic-inlining/Android.bp
+++ b/test/576-polymorphic-inlining/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-576-polymorphic-inlining-expected"],
+    data: [":art-run-test-576-polymorphic-inlining-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-576-polymorphic-inlining-expected",
-    out: ["art-run-test-576-polymorphic-inlining-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-576-polymorphic-inlining-expected-stdout",
+    out: ["art-run-test-576-polymorphic-inlining-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/576-polymorphic-inlining/expected-stdout.txt

diff --git a/test/576-polymorphic-inlining/expected.txt b/test/576-polymorphic-inlining/expected-stdout.txt
similarity index 100%
rename from test/576-polymorphic-inlining/expected.txt
rename to test/576-polymorphic-inlining/expected-stdout.txt

test/577-checker-fp2int/Android.bp

diff --git a/test/577-checker-fp2int/Android.bp b/test/577-checker-fp2int/Android.bp
index 09c9d80..a9f9acb 100644
--- a/test/577-checker-fp2int/Android.bp
+++ b/test/577-checker-fp2int/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-577-checker-fp2int-expected"],
+    data: [":art-run-test-577-checker-fp2int-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-577-checker-fp2int-expected",
-    out: ["art-run-test-577-checker-fp2int-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-577-checker-fp2int-expected-stdout",
+    out: ["art-run-test-577-checker-fp2int-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/577-checker-fp2int/expected-stdout.txt

diff --git a/test/577-checker-fp2int/expected.txt b/test/577-checker-fp2int/expected-stdout.txt
similarity index 100%
rename from test/577-checker-fp2int/expected.txt
rename to test/577-checker-fp2int/expected-stdout.txt

test/578-bce-visit/Android.bp

diff --git a/test/578-bce-visit/Android.bp b/test/578-bce-visit/Android.bp
index 5903401..bcb81c3 100644
--- a/test/578-bce-visit/Android.bp
+++ b/test/578-bce-visit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-578-bce-visit-expected"],
+    data: [":art-run-test-578-bce-visit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-578-bce-visit-expected",
-    out: ["art-run-test-578-bce-visit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-578-bce-visit-expected-stdout",
+    out: ["art-run-test-578-bce-visit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/578-bce-visit/expected-stdout.txt

diff --git a/test/578-bce-visit/expected.txt b/test/578-bce-visit/expected-stdout.txt
similarity index 100%
rename from test/578-bce-visit/expected.txt
rename to test/578-bce-visit/expected-stdout.txt

test/578-polymorphic-inlining/Android.bp

diff --git a/test/578-polymorphic-inlining/Android.bp b/test/578-polymorphic-inlining/Android.bp
index 8ab7ac0..b8bed4c 100644
--- a/test/578-polymorphic-inlining/Android.bp
+++ b/test/578-polymorphic-inlining/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-578-polymorphic-inlining-expected"],
+    data: [":art-run-test-578-polymorphic-inlining-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-578-polymorphic-inlining-expected",
-    out: ["art-run-test-578-polymorphic-inlining-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-578-polymorphic-inlining-expected-stdout",
+    out: ["art-run-test-578-polymorphic-inlining-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/578-polymorphic-inlining/expected-stdout.txt

diff --git a/test/578-polymorphic-inlining/expected.txt b/test/578-polymorphic-inlining/expected-stdout.txt
similarity index 100%
rename from test/578-polymorphic-inlining/expected.txt
rename to test/578-polymorphic-inlining/expected-stdout.txt

test/579-inline-infinite/Android.bp

diff --git a/test/579-inline-infinite/Android.bp b/test/579-inline-infinite/Android.bp
index 78aa062..f31f06e 100644
--- a/test/579-inline-infinite/Android.bp
+++ b/test/579-inline-infinite/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-579-inline-infinite-expected"],
+    data: [":art-run-test-579-inline-infinite-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-579-inline-infinite-expected",
-    out: ["art-run-test-579-inline-infinite-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-579-inline-infinite-expected-stdout",
+    out: ["art-run-test-579-inline-infinite-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/579-inline-infinite/expected-stdout.txt

diff --git a/test/579-inline-infinite/expected.txt b/test/579-inline-infinite/expected-stdout.txt
similarity index 100%
rename from test/579-inline-infinite/expected.txt
rename to test/579-inline-infinite/expected-stdout.txt

test/580-checker-round/Android.bp

diff --git a/test/580-checker-round/Android.bp b/test/580-checker-round/Android.bp
index a81edd6..55c77cc 100644
--- a/test/580-checker-round/Android.bp
+++ b/test/580-checker-round/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-580-checker-round-expected"],
+    data: [":art-run-test-580-checker-round-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-580-checker-round-expected",
-    out: ["art-run-test-580-checker-round-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-580-checker-round-expected-stdout",
+    out: ["art-run-test-580-checker-round-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/580-checker-round/expected-stdout.txt

diff --git a/test/580-checker-round/expected.txt b/test/580-checker-round/expected-stdout.txt
similarity index 100%
rename from test/580-checker-round/expected.txt
rename to test/580-checker-round/expected-stdout.txt

test/580-checker-string-fact-intrinsics/expected-stdout.txt

diff --git a/test/580-checker-string-fact-intrinsics/expected.txt b/test/580-checker-string-fact-intrinsics/expected-stdout.txt
similarity index 100%
rename from test/580-checker-string-fact-intrinsics/expected.txt
rename to test/580-checker-string-fact-intrinsics/expected-stdout.txt

test/580-crc32/Android.bp

diff --git a/test/580-crc32/Android.bp b/test/580-crc32/Android.bp
index dfef91d..07dfc96 100644
--- a/test/580-crc32/Android.bp
+++ b/test/580-crc32/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-580-crc32-expected"],
+    data: [":art-run-test-580-crc32-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-580-crc32-expected",
-    out: ["art-run-test-580-crc32-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-580-crc32-expected-stdout",
+    out: ["art-run-test-580-crc32-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/580-crc32/expected-stdout.txt

diff --git a/test/580-crc32/expected.txt b/test/580-crc32/expected-stdout.txt
similarity index 100%
rename from test/580-crc32/expected.txt
rename to test/580-crc32/expected-stdout.txt

test/580-fp16/expected-stdout.txt

diff --git a/test/580-fp16/expected.txt b/test/580-fp16/expected-stdout.txt
similarity index 100%
rename from test/580-fp16/expected.txt
rename to test/580-fp16/expected-stdout.txt

test/581-rtp/Android.bp

diff --git a/test/581-rtp/Android.bp b/test/581-rtp/Android.bp
index 51f830a..7d321cd 100644
--- a/test/581-rtp/Android.bp
+++ b/test/581-rtp/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-581-rtp-expected"],
+    data: [":art-run-test-581-rtp-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-581-rtp-expected",
-    out: ["art-run-test-581-rtp-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-581-rtp-expected-stdout",
+    out: ["art-run-test-581-rtp-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/581-rtp/expected-stdout.txt

diff --git a/test/581-rtp/expected.txt b/test/581-rtp/expected-stdout.txt
similarity index 100%
rename from test/581-rtp/expected.txt
rename to test/581-rtp/expected-stdout.txt

test/582-checker-bce-length/Android.bp

diff --git a/test/582-checker-bce-length/Android.bp b/test/582-checker-bce-length/Android.bp
index ea8275a..016a51a 100644
--- a/test/582-checker-bce-length/Android.bp
+++ b/test/582-checker-bce-length/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-582-checker-bce-length-expected"],
+    data: [":art-run-test-582-checker-bce-length-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-582-checker-bce-length-expected",
-    out: ["art-run-test-582-checker-bce-length-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-582-checker-bce-length-expected-stdout",
+    out: ["art-run-test-582-checker-bce-length-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/582-checker-bce-length/expected-stdout.txt

diff --git a/test/582-checker-bce-length/expected.txt b/test/582-checker-bce-length/expected-stdout.txt
similarity index 100%
rename from test/582-checker-bce-length/expected.txt
rename to test/582-checker-bce-length/expected-stdout.txt

test/583-checker-zero/Android.bp

diff --git a/test/583-checker-zero/Android.bp b/test/583-checker-zero/Android.bp
index d599c21..0792faf 100644
--- a/test/583-checker-zero/Android.bp
+++ b/test/583-checker-zero/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-583-checker-zero-expected"],
+    data: [":art-run-test-583-checker-zero-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-583-checker-zero-expected",
-    out: ["art-run-test-583-checker-zero-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-583-checker-zero-expected-stdout",
+    out: ["art-run-test-583-checker-zero-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/583-checker-zero/expected-stdout.txt

diff --git a/test/583-checker-zero/expected.txt b/test/583-checker-zero/expected-stdout.txt
similarity index 100%
rename from test/583-checker-zero/expected.txt
rename to test/583-checker-zero/expected-stdout.txt

test/584-checker-div-bool/Android.bp

diff --git a/test/584-checker-div-bool/Android.bp b/test/584-checker-div-bool/Android.bp
index 381ab01..96d64f3 100644
--- a/test/584-checker-div-bool/Android.bp
+++ b/test/584-checker-div-bool/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-584-checker-div-bool-expected"],
+    data: [":art-run-test-584-checker-div-bool-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-584-checker-div-bool-expected",
-    out: ["art-run-test-584-checker-div-bool-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-584-checker-div-bool-expected-stdout",
+    out: ["art-run-test-584-checker-div-bool-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/584-checker-div-bool/expected-stdout.txt

diff --git a/test/584-checker-div-bool/expected.txt b/test/584-checker-div-bool/expected-stdout.txt
similarity index 100%
rename from test/584-checker-div-bool/expected.txt
rename to test/584-checker-div-bool/expected-stdout.txt

test/585-inline-unresolved/expected-stdout.txt

diff --git a/test/585-inline-unresolved/expected.txt b/test/585-inline-unresolved/expected-stdout.txt
similarity index 100%
rename from test/585-inline-unresolved/expected.txt
rename to test/585-inline-unresolved/expected-stdout.txt

test/586-checker-null-array-get/expected-stdout.txt

diff --git a/test/586-checker-null-array-get/expected.txt b/test/586-checker-null-array-get/expected-stdout.txt
similarity index 100%
rename from test/586-checker-null-array-get/expected.txt
rename to test/586-checker-null-array-get/expected-stdout.txt

test/587-inline-class-error/expected-stdout.txt

diff --git a/test/587-inline-class-error/expected.txt b/test/587-inline-class-error/expected-stdout.txt
similarity index 100%
rename from test/587-inline-class-error/expected.txt
rename to test/587-inline-class-error/expected-stdout.txt

test/588-checker-irreducib-lifetime-hole/expected-stdout.txt

diff --git a/test/588-checker-irreducib-lifetime-hole/expected.txt b/test/588-checker-irreducib-lifetime-hole/expected-stdout.txt
similarity index 100%
rename from test/588-checker-irreducib-lifetime-hole/expected.txt
rename to test/588-checker-irreducib-lifetime-hole/expected-stdout.txt

test/589-super-imt/Android.bp

diff --git a/test/589-super-imt/Android.bp b/test/589-super-imt/Android.bp
index a2235e9..1bb6538 100644
--- a/test/589-super-imt/Android.bp
+++ b/test/589-super-imt/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-589-super-imt-expected"],
+    data: [":art-run-test-589-super-imt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-589-super-imt-expected",
-    out: ["art-run-test-589-super-imt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-589-super-imt-expected-stdout",
+    out: ["art-run-test-589-super-imt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/589-super-imt/expected-stdout.txt

diff --git a/test/589-super-imt/expected.txt b/test/589-super-imt/expected-stdout.txt
similarity index 100%
rename from test/589-super-imt/expected.txt
rename to test/589-super-imt/expected-stdout.txt

test/590-checker-arr-set-null-regression/Android.bp

diff --git a/test/590-checker-arr-set-null-regression/Android.bp b/test/590-checker-arr-set-null-regression/Android.bp
index 0b33cdc..578e8a8 100644
--- a/test/590-checker-arr-set-null-regression/Android.bp
+++ b/test/590-checker-arr-set-null-regression/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-590-checker-arr-set-null-regression-expected"],
+    data: [":art-run-test-590-checker-arr-set-null-regression-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-590-checker-arr-set-null-regression-expected",
-    out: ["art-run-test-590-checker-arr-set-null-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-590-checker-arr-set-null-regression-expected-stdout",
+    out: ["art-run-test-590-checker-arr-set-null-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/590-checker-arr-set-null-regression/expected-stdout.txt

diff --git a/test/590-checker-arr-set-null-regression/expected.txt b/test/590-checker-arr-set-null-regression/expected-stdout.txt
similarity index 100%
rename from test/590-checker-arr-set-null-regression/expected.txt
rename to test/590-checker-arr-set-null-regression/expected-stdout.txt

test/590-infinite-loop-with-nop/expected-stdout.txt

diff --git a/test/590-infinite-loop-with-nop/expected.txt b/test/590-infinite-loop-with-nop/expected-stdout.txt
similarity index 100%
rename from test/590-infinite-loop-with-nop/expected.txt
rename to test/590-infinite-loop-with-nop/expected-stdout.txt

test/591-checker-regression-dead-loop/Android.bp

diff --git a/test/591-checker-regression-dead-loop/Android.bp b/test/591-checker-regression-dead-loop/Android.bp
index 979d099..8aa6149 100644
--- a/test/591-checker-regression-dead-loop/Android.bp
+++ b/test/591-checker-regression-dead-loop/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-591-checker-regression-dead-loop-expected"],
+    data: [":art-run-test-591-checker-regression-dead-loop-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-591-checker-regression-dead-loop-expected",
-    out: ["art-run-test-591-checker-regression-dead-loop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-591-checker-regression-dead-loop-expected-stdout",
+    out: ["art-run-test-591-checker-regression-dead-loop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/591-checker-regression-dead-loop/expected-stdout.txt

diff --git a/test/591-checker-regression-dead-loop/expected.txt b/test/591-checker-regression-dead-loop/expected-stdout.txt
similarity index 100%
rename from test/591-checker-regression-dead-loop/expected.txt
rename to test/591-checker-regression-dead-loop/expected-stdout.txt

test/591-new-instance-string/expected-stdout.txt

diff --git a/test/591-new-instance-string/expected.txt b/test/591-new-instance-string/expected-stdout.txt
similarity index 100%
rename from test/591-new-instance-string/expected.txt
rename to test/591-new-instance-string/expected-stdout.txt

test/592-checker-regression-bool-input/expected-stdout.txt

diff --git a/test/592-checker-regression-bool-input/expected.txt b/test/592-checker-regression-bool-input/expected-stdout.txt
similarity index 100%
rename from test/592-checker-regression-bool-input/expected.txt
rename to test/592-checker-regression-bool-input/expected-stdout.txt

test/593-checker-boolean-2-integral-conv/expected-stdout.txt

diff --git a/test/593-checker-boolean-2-integral-conv/expected.txt b/test/593-checker-boolean-2-integral-conv/expected-stdout.txt
similarity index 100%
rename from test/593-checker-boolean-2-integral-conv/expected.txt
rename to test/593-checker-boolean-2-integral-conv/expected-stdout.txt

test/593-checker-long-2-float-regression/Android.bp

diff --git a/test/593-checker-long-2-float-regression/Android.bp b/test/593-checker-long-2-float-regression/Android.bp
index 8d2b591..a6eaaac 100644
--- a/test/593-checker-long-2-float-regression/Android.bp
+++ b/test/593-checker-long-2-float-regression/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-593-checker-long-2-float-regression-expected"],
+    data: [":art-run-test-593-checker-long-2-float-regression-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-593-checker-long-2-float-regression-expected",
-    out: ["art-run-test-593-checker-long-2-float-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-593-checker-long-2-float-regression-expected-stdout",
+    out: ["art-run-test-593-checker-long-2-float-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/593-checker-long-2-float-regression/expected-stdout.txt

diff --git a/test/593-checker-long-2-float-regression/expected.txt b/test/593-checker-long-2-float-regression/expected-stdout.txt
similarity index 100%
rename from test/593-checker-long-2-float-regression/expected.txt
rename to test/593-checker-long-2-float-regression/expected-stdout.txt

test/593-checker-shift-and-simplifier/expected-stdout.txt

diff --git a/test/593-checker-shift-and-simplifier/expected.txt b/test/593-checker-shift-and-simplifier/expected-stdout.txt
similarity index 100%
rename from test/593-checker-shift-and-simplifier/expected.txt
rename to test/593-checker-shift-and-simplifier/expected-stdout.txt

test/594-checker-array-alias/Android.bp

diff --git a/test/594-checker-array-alias/Android.bp b/test/594-checker-array-alias/Android.bp
index b2c3427..b3a2bcf 100644
--- a/test/594-checker-array-alias/Android.bp
+++ b/test/594-checker-array-alias/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-594-checker-array-alias-expected"],
+    data: [":art-run-test-594-checker-array-alias-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-594-checker-array-alias-expected",
-    out: ["art-run-test-594-checker-array-alias-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-594-checker-array-alias-expected-stdout",
+    out: ["art-run-test-594-checker-array-alias-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/594-checker-array-alias/expected-stdout.txt

diff --git a/test/594-checker-array-alias/expected.txt b/test/594-checker-array-alias/expected-stdout.txt
similarity index 100%
rename from test/594-checker-array-alias/expected.txt
rename to test/594-checker-array-alias/expected-stdout.txt

test/594-checker-irreducible-linorder/expected-stdout.txt

diff --git a/test/594-checker-irreducible-linorder/expected.txt b/test/594-checker-irreducible-linorder/expected-stdout.txt
similarity index 100%
rename from test/594-checker-irreducible-linorder/expected.txt
rename to test/594-checker-irreducible-linorder/expected-stdout.txt

test/594-invoke-super/expected-stdout.txt

diff --git a/test/594-invoke-super/expected.txt b/test/594-invoke-super/expected-stdout.txt
similarity index 100%
rename from test/594-invoke-super/expected.txt
rename to test/594-invoke-super/expected-stdout.txt

test/594-load-string-regression/Android.bp

diff --git a/test/594-load-string-regression/Android.bp b/test/594-load-string-regression/Android.bp
index 674a816..e70bad9 100644
--- a/test/594-load-string-regression/Android.bp
+++ b/test/594-load-string-regression/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-594-load-string-regression-expected"],
+    data: [":art-run-test-594-load-string-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-594-load-string-regression-expected",
-    out: ["art-run-test-594-load-string-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-594-load-string-regression-expected-stdout",
+    out: ["art-run-test-594-load-string-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/594-load-string-regression/expected-stdout.txt

diff --git a/test/594-load-string-regression/expected.txt b/test/594-load-string-regression/expected-stdout.txt
similarity index 100%
rename from test/594-load-string-regression/expected.txt
rename to test/594-load-string-regression/expected-stdout.txt

test/595-error-class/expected-stdout.txt

diff --git a/test/595-error-class/expected.txt b/test/595-error-class/expected-stdout.txt
similarity index 100%
rename from test/595-error-class/expected.txt
rename to test/595-error-class/expected-stdout.txt

test/595-profile-saving/Android.bp

diff --git a/test/595-profile-saving/Android.bp b/test/595-profile-saving/Android.bp
index f8f233b..f0144f3 100644
--- a/test/595-profile-saving/Android.bp
+++ b/test/595-profile-saving/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-595-profile-saving-expected"],
+    data: [":art-run-test-595-profile-saving-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-595-profile-saving-expected",
-    out: ["art-run-test-595-profile-saving-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-595-profile-saving-expected-stdout",
+    out: ["art-run-test-595-profile-saving-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/595-profile-saving/expected-stdout.txt

diff --git a/test/595-profile-saving/expected.txt b/test/595-profile-saving/expected-stdout.txt
similarity index 100%
rename from test/595-profile-saving/expected.txt
rename to test/595-profile-saving/expected-stdout.txt

test/596-app-images/expected-stdout.txt

diff --git a/test/596-app-images/expected.txt b/test/596-app-images/expected-stdout.txt
similarity index 100%
rename from test/596-app-images/expected.txt
rename to test/596-app-images/expected-stdout.txt

test/596-checker-dead-phi/expected-stdout.txt

diff --git a/test/596-checker-dead-phi/expected.txt b/test/596-checker-dead-phi/expected-stdout.txt
similarity index 100%
rename from test/596-checker-dead-phi/expected.txt
rename to test/596-checker-dead-phi/expected-stdout.txt

test/596-monitor-inflation/expected-stdout.txt

diff --git a/test/596-monitor-inflation/expected.txt b/test/596-monitor-inflation/expected-stdout.txt
similarity index 100%
rename from test/596-monitor-inflation/expected.txt
rename to test/596-monitor-inflation/expected-stdout.txt

test/597-app-images-same-classloader/expected-stdout.txt

diff --git a/test/597-app-images-same-classloader/expected.txt b/test/597-app-images-same-classloader/expected-stdout.txt
similarity index 100%
rename from test/597-app-images-same-classloader/expected.txt
rename to test/597-app-images-same-classloader/expected-stdout.txt

test/597-deopt-busy-loop/Android.bp

diff --git a/test/597-deopt-busy-loop/Android.bp b/test/597-deopt-busy-loop/Android.bp
index 9768f12..c8d5d34 100644
--- a/test/597-deopt-busy-loop/Android.bp
+++ b/test/597-deopt-busy-loop/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-597-deopt-busy-loop-expected"],
+    data: [":art-run-test-597-deopt-busy-loop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-597-deopt-busy-loop-expected",
-    out: ["art-run-test-597-deopt-busy-loop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-597-deopt-busy-loop-expected-stdout",
+    out: ["art-run-test-597-deopt-busy-loop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/597-deopt-busy-loop/expected-stdout.txt

diff --git a/test/597-deopt-busy-loop/expected.txt b/test/597-deopt-busy-loop/expected-stdout.txt
similarity index 100%
rename from test/597-deopt-busy-loop/expected.txt
rename to test/597-deopt-busy-loop/expected-stdout.txt

test/597-deopt-invoke-stub/Android.bp

diff --git a/test/597-deopt-invoke-stub/Android.bp b/test/597-deopt-invoke-stub/Android.bp
index 02efbe1..4c1ed1f 100644
--- a/test/597-deopt-invoke-stub/Android.bp
+++ b/test/597-deopt-invoke-stub/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-597-deopt-invoke-stub-expected"],
+    data: [":art-run-test-597-deopt-invoke-stub-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-597-deopt-invoke-stub-expected",
-    out: ["art-run-test-597-deopt-invoke-stub-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-597-deopt-invoke-stub-expected-stdout",
+    out: ["art-run-test-597-deopt-invoke-stub-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/597-deopt-invoke-stub/expected-stdout.txt

diff --git a/test/597-deopt-invoke-stub/expected.txt b/test/597-deopt-invoke-stub/expected-stdout.txt
similarity index 100%
rename from test/597-deopt-invoke-stub/expected.txt
rename to test/597-deopt-invoke-stub/expected-stdout.txt

test/597-deopt-new-string/Android.bp

diff --git a/test/597-deopt-new-string/Android.bp b/test/597-deopt-new-string/Android.bp
index 0b83630..63eedbc 100644
--- a/test/597-deopt-new-string/Android.bp
+++ b/test/597-deopt-new-string/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-597-deopt-new-string-expected"],
+    data: [":art-run-test-597-deopt-new-string-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-597-deopt-new-string-expected",
-    out: ["art-run-test-597-deopt-new-string-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-597-deopt-new-string-expected-stdout",
+    out: ["art-run-test-597-deopt-new-string-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/597-deopt-new-string/expected-stdout.txt

diff --git a/test/597-deopt-new-string/expected.txt b/test/597-deopt-new-string/expected-stdout.txt
similarity index 100%
rename from test/597-deopt-new-string/expected.txt
rename to test/597-deopt-new-string/expected-stdout.txt

test/598-checker-irreducible-dominance/expected-stdout.txt

diff --git a/test/598-checker-irreducible-dominance/expected.txt b/test/598-checker-irreducible-dominance/expected-stdout.txt
similarity index 100%
rename from test/598-checker-irreducible-dominance/expected.txt
rename to test/598-checker-irreducible-dominance/expected-stdout.txt

test/599-checker-irreducible-loop/expected-stdout.txt

diff --git a/test/599-checker-irreducible-loop/expected.txt b/test/599-checker-irreducible-loop/expected-stdout.txt
similarity index 100%
rename from test/599-checker-irreducible-loop/expected.txt
rename to test/599-checker-irreducible-loop/expected-stdout.txt

test/600-verifier-fails/expected-stdout.txt

diff --git a/test/600-verifier-fails/expected.txt b/test/600-verifier-fails/expected-stdout.txt
similarity index 100%
rename from test/600-verifier-fails/expected.txt
rename to test/600-verifier-fails/expected-stdout.txt

test/601-method-access/expected-stdout.txt

diff --git a/test/601-method-access/expected.txt b/test/601-method-access/expected-stdout.txt
similarity index 100%
rename from test/601-method-access/expected.txt
rename to test/601-method-access/expected-stdout.txt

test/602-deoptimizeable/Android.bp

diff --git a/test/602-deoptimizeable/Android.bp b/test/602-deoptimizeable/Android.bp
index 322caee..95f0af3 100644
--- a/test/602-deoptimizeable/Android.bp
+++ b/test/602-deoptimizeable/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-602-deoptimizeable-expected"],
+    data: [":art-run-test-602-deoptimizeable-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-602-deoptimizeable-expected",
-    out: ["art-run-test-602-deoptimizeable-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-602-deoptimizeable-expected-stdout",
+    out: ["art-run-test-602-deoptimizeable-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/602-deoptimizeable/expected-stdout.txt

diff --git a/test/602-deoptimizeable/expected.txt b/test/602-deoptimizeable/expected-stdout.txt
similarity index 100%
rename from test/602-deoptimizeable/expected.txt
rename to test/602-deoptimizeable/expected-stdout.txt

test/603-checker-instanceof/Android.bp

diff --git a/test/603-checker-instanceof/Android.bp b/test/603-checker-instanceof/Android.bp
index cdab711..4185424 100644
--- a/test/603-checker-instanceof/Android.bp
+++ b/test/603-checker-instanceof/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-603-checker-instanceof-expected"],
+    data: [":art-run-test-603-checker-instanceof-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-603-checker-instanceof-expected",
-    out: ["art-run-test-603-checker-instanceof-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-603-checker-instanceof-expected-stdout",
+    out: ["art-run-test-603-checker-instanceof-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/603-checker-instanceof/expected-stdout.txt

diff --git a/test/603-checker-instanceof/expected.txt b/test/603-checker-instanceof/expected-stdout.txt
similarity index 100%
rename from test/603-checker-instanceof/expected.txt
rename to test/603-checker-instanceof/expected-stdout.txt

test/604-hot-static-interface/Android.bp

diff --git a/test/604-hot-static-interface/Android.bp b/test/604-hot-static-interface/Android.bp
index 2eac8a6..59c3623 100644
--- a/test/604-hot-static-interface/Android.bp
+++ b/test/604-hot-static-interface/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-604-hot-static-interface-expected"],
+    data: [":art-run-test-604-hot-static-interface-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-604-hot-static-interface-expected",
-    out: ["art-run-test-604-hot-static-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-604-hot-static-interface-expected-stdout",
+    out: ["art-run-test-604-hot-static-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/604-hot-static-interface/expected-stdout.txt

diff --git a/test/604-hot-static-interface/expected.txt b/test/604-hot-static-interface/expected-stdout.txt
similarity index 100%
rename from test/604-hot-static-interface/expected.txt
rename to test/604-hot-static-interface/expected-stdout.txt

test/605-new-string-from-bytes/Android.bp

diff --git a/test/605-new-string-from-bytes/Android.bp b/test/605-new-string-from-bytes/Android.bp
index bb3fb80..3524a8b 100644
--- a/test/605-new-string-from-bytes/Android.bp
+++ b/test/605-new-string-from-bytes/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-605-new-string-from-bytes-expected"],
+    data: [":art-run-test-605-new-string-from-bytes-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-605-new-string-from-bytes-expected",
-    out: ["art-run-test-605-new-string-from-bytes-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-605-new-string-from-bytes-expected-stdout",
+    out: ["art-run-test-605-new-string-from-bytes-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/605-new-string-from-bytes/expected-stdout.txt

diff --git a/test/605-new-string-from-bytes/expected.txt b/test/605-new-string-from-bytes/expected-stdout.txt
similarity index 100%
rename from test/605-new-string-from-bytes/expected.txt
rename to test/605-new-string-from-bytes/expected-stdout.txt

test/606-erroneous-class/expected-stdout.txt

diff --git a/test/606-erroneous-class/expected.txt b/test/606-erroneous-class/expected-stdout.txt
similarity index 100%
rename from test/606-erroneous-class/expected.txt
rename to test/606-erroneous-class/expected-stdout.txt

test/607-daemon-stress/Android.bp

diff --git a/test/607-daemon-stress/Android.bp b/test/607-daemon-stress/Android.bp
index 4b60c9a..2f539db 100644
--- a/test/607-daemon-stress/Android.bp
+++ b/test/607-daemon-stress/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-607-daemon-stress-expected"],
+    data: [":art-run-test-607-daemon-stress-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-607-daemon-stress-expected",
-    out: ["art-run-test-607-daemon-stress-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-607-daemon-stress-expected-stdout",
+    out: ["art-run-test-607-daemon-stress-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/607-daemon-stress/expected-stdout.txt

diff --git a/test/607-daemon-stress/expected.txt b/test/607-daemon-stress/expected-stdout.txt
similarity index 100%
rename from test/607-daemon-stress/expected.txt
rename to test/607-daemon-stress/expected-stdout.txt

test/608-checker-unresolved-lse/expected-stdout.txt

diff --git a/test/608-checker-unresolved-lse/expected.txt b/test/608-checker-unresolved-lse/expected-stdout.txt
similarity index 100%
rename from test/608-checker-unresolved-lse/expected.txt
rename to test/608-checker-unresolved-lse/expected-stdout.txt

test/609-checker-inline-interface/Android.bp

diff --git a/test/609-checker-inline-interface/Android.bp b/test/609-checker-inline-interface/Android.bp
index 1928884..b2ad70c 100644
--- a/test/609-checker-inline-interface/Android.bp
+++ b/test/609-checker-inline-interface/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-609-checker-inline-interface-expected"],
+    data: [":art-run-test-609-checker-inline-interface-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-609-checker-inline-interface-expected",
-    out: ["art-run-test-609-checker-inline-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-609-checker-inline-interface-expected-stdout",
+    out: ["art-run-test-609-checker-inline-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/609-checker-inline-interface/expected-stdout.txt

diff --git a/test/609-checker-inline-interface/expected.txt b/test/609-checker-inline-interface/expected-stdout.txt
similarity index 100%
rename from test/609-checker-inline-interface/expected.txt
rename to test/609-checker-inline-interface/expected-stdout.txt

test/609-checker-x86-bounds-check/Android.bp

diff --git a/test/609-checker-x86-bounds-check/Android.bp b/test/609-checker-x86-bounds-check/Android.bp
index 3d3b412..eab2ab6 100644
--- a/test/609-checker-x86-bounds-check/Android.bp
+++ b/test/609-checker-x86-bounds-check/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-609-checker-x86-bounds-check-expected"],
+    data: [":art-run-test-609-checker-x86-bounds-check-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-609-checker-x86-bounds-check-expected",
-    out: ["art-run-test-609-checker-x86-bounds-check-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-609-checker-x86-bounds-check-expected-stdout",
+    out: ["art-run-test-609-checker-x86-bounds-check-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/609-checker-x86-bounds-check/expected-stdout.txt

diff --git a/test/609-checker-x86-bounds-check/expected.txt b/test/609-checker-x86-bounds-check/expected-stdout.txt
similarity index 100%
rename from test/609-checker-x86-bounds-check/expected.txt
rename to test/609-checker-x86-bounds-check/expected-stdout.txt

test/610-arraycopy/Android.bp

diff --git a/test/610-arraycopy/Android.bp b/test/610-arraycopy/Android.bp
index 1415061..d775c13 100644
--- a/test/610-arraycopy/Android.bp
+++ b/test/610-arraycopy/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-610-arraycopy-expected"],
+    data: [":art-run-test-610-arraycopy-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-610-arraycopy-expected",
-    out: ["art-run-test-610-arraycopy-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-610-arraycopy-expected-stdout",
+    out: ["art-run-test-610-arraycopy-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/610-arraycopy/expected-stdout.txt

diff --git a/test/610-arraycopy/expected.txt b/test/610-arraycopy/expected-stdout.txt
similarity index 100%
rename from test/610-arraycopy/expected.txt
rename to test/610-arraycopy/expected-stdout.txt

test/611-checker-simplify-if/Android.bp

diff --git a/test/611-checker-simplify-if/Android.bp b/test/611-checker-simplify-if/Android.bp
index af75af6..be60c4b 100644
--- a/test/611-checker-simplify-if/Android.bp
+++ b/test/611-checker-simplify-if/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-611-checker-simplify-if-expected"],
+    data: [":art-run-test-611-checker-simplify-if-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-611-checker-simplify-if-expected",
-    out: ["art-run-test-611-checker-simplify-if-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-611-checker-simplify-if-expected-stdout",
+    out: ["art-run-test-611-checker-simplify-if-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/611-checker-simplify-if/expected-stdout.txt

diff --git a/test/611-checker-simplify-if/expected.txt b/test/611-checker-simplify-if/expected-stdout.txt
similarity index 100%
rename from test/611-checker-simplify-if/expected.txt
rename to test/611-checker-simplify-if/expected-stdout.txt

test/612-jit-dex-cache/expected-stdout.txt

diff --git a/test/612-jit-dex-cache/expected.txt b/test/612-jit-dex-cache/expected-stdout.txt
similarity index 100%
rename from test/612-jit-dex-cache/expected.txt
rename to test/612-jit-dex-cache/expected-stdout.txt

test/613-inlining-dex-cache/expected-stdout.txt

diff --git a/test/613-inlining-dex-cache/expected.txt b/test/613-inlining-dex-cache/expected-stdout.txt
similarity index 100%
rename from test/613-inlining-dex-cache/expected.txt
rename to test/613-inlining-dex-cache/expected-stdout.txt

test/614-checker-dump-constant-location/Android.bp

diff --git a/test/614-checker-dump-constant-location/Android.bp b/test/614-checker-dump-constant-location/Android.bp
index aa1a6fe..dca6dc9 100644
--- a/test/614-checker-dump-constant-location/Android.bp
+++ b/test/614-checker-dump-constant-location/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-614-checker-dump-constant-location-expected"],
+    data: [":art-run-test-614-checker-dump-constant-location-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-614-checker-dump-constant-location-expected",
-    out: ["art-run-test-614-checker-dump-constant-location-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-614-checker-dump-constant-location-expected-stdout",
+    out: ["art-run-test-614-checker-dump-constant-location-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/614-checker-dump-constant-location/expected-stdout.txt

diff --git a/test/614-checker-dump-constant-location/expected.txt b/test/614-checker-dump-constant-location/expected-stdout.txt
similarity index 100%
rename from test/614-checker-dump-constant-location/expected.txt
rename to test/614-checker-dump-constant-location/expected-stdout.txt

test/615-checker-arm64-store-zero/Android.bp

diff --git a/test/615-checker-arm64-store-zero/Android.bp b/test/615-checker-arm64-store-zero/Android.bp
index 88cff5f..6c1687e 100644
--- a/test/615-checker-arm64-store-zero/Android.bp
+++ b/test/615-checker-arm64-store-zero/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-615-checker-arm64-store-zero-expected"],
+    data: [":art-run-test-615-checker-arm64-store-zero-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-615-checker-arm64-store-zero-expected",
-    out: ["art-run-test-615-checker-arm64-store-zero-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-615-checker-arm64-store-zero-expected-stdout",
+    out: ["art-run-test-615-checker-arm64-store-zero-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/615-checker-arm64-store-zero/expected-stdout.txt

diff --git a/test/615-checker-arm64-store-zero/expected.txt b/test/615-checker-arm64-store-zero/expected-stdout.txt
similarity index 100%
rename from test/615-checker-arm64-store-zero/expected.txt
rename to test/615-checker-arm64-store-zero/expected-stdout.txt

test/616-cha-abstract/Android.bp

diff --git a/test/616-cha-abstract/Android.bp b/test/616-cha-abstract/Android.bp
index dece12f..856561e 100644
--- a/test/616-cha-abstract/Android.bp
+++ b/test/616-cha-abstract/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-616-cha-abstract-expected"],
+    data: [":art-run-test-616-cha-abstract-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-616-cha-abstract-expected",
-    out: ["art-run-test-616-cha-abstract-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-616-cha-abstract-expected-stdout",
+    out: ["art-run-test-616-cha-abstract-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/616-cha-abstract/expected-stdout.txt

diff --git a/test/616-cha-abstract/expected.txt b/test/616-cha-abstract/expected-stdout.txt
similarity index 100%
rename from test/616-cha-abstract/expected.txt
rename to test/616-cha-abstract/expected-stdout.txt

test/616-cha-interface-default/expected-stdout.txt

diff --git a/test/616-cha-interface-default/expected.txt b/test/616-cha-interface-default/expected-stdout.txt
similarity index 100%
rename from test/616-cha-interface-default/expected.txt
rename to test/616-cha-interface-default/expected-stdout.txt

test/616-cha-interface/Android.bp

diff --git a/test/616-cha-interface/Android.bp b/test/616-cha-interface/Android.bp
index 7b25f02..404594b 100644
--- a/test/616-cha-interface/Android.bp
+++ b/test/616-cha-interface/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-616-cha-interface-expected"],
+    data: [":art-run-test-616-cha-interface-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-616-cha-interface-expected",
-    out: ["art-run-test-616-cha-interface-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-616-cha-interface-expected-stdout",
+    out: ["art-run-test-616-cha-interface-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/616-cha-interface/expected-stdout.txt

diff --git a/test/616-cha-interface/expected.txt b/test/616-cha-interface/expected-stdout.txt
similarity index 100%
rename from test/616-cha-interface/expected.txt
rename to test/616-cha-interface/expected-stdout.txt

test/616-cha-miranda/Android.bp

diff --git a/test/616-cha-miranda/Android.bp b/test/616-cha-miranda/Android.bp
index 04554bb..81d4ba9 100644
--- a/test/616-cha-miranda/Android.bp
+++ b/test/616-cha-miranda/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-616-cha-miranda-expected"],
+    data: [":art-run-test-616-cha-miranda-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-616-cha-miranda-expected",
-    out: ["art-run-test-616-cha-miranda-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-616-cha-miranda-expected-stdout",
+    out: ["art-run-test-616-cha-miranda-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/616-cha-miranda/expected-stdout.txt

diff --git a/test/616-cha-miranda/expected.txt b/test/616-cha-miranda/expected-stdout.txt
similarity index 100%
rename from test/616-cha-miranda/expected.txt
rename to test/616-cha-miranda/expected-stdout.txt

test/616-cha-native/Android.bp

diff --git a/test/616-cha-native/Android.bp b/test/616-cha-native/Android.bp
index 635f2bb..d903271 100644
--- a/test/616-cha-native/Android.bp
+++ b/test/616-cha-native/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-616-cha-native-expected"],
+    data: [":art-run-test-616-cha-native-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-616-cha-native-expected",
-    out: ["art-run-test-616-cha-native-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-616-cha-native-expected-stdout",
+    out: ["art-run-test-616-cha-native-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/616-cha-native/expected-stdout.txt

diff --git a/test/616-cha-native/expected.txt b/test/616-cha-native/expected-stdout.txt
similarity index 100%
rename from test/616-cha-native/expected.txt
rename to test/616-cha-native/expected-stdout.txt

test/616-cha-proxy-method-inline/expected-stdout.txt

diff --git a/test/616-cha-proxy-method-inline/expected.txt b/test/616-cha-proxy-method-inline/expected-stdout.txt
similarity index 100%
rename from test/616-cha-proxy-method-inline/expected.txt
rename to test/616-cha-proxy-method-inline/expected-stdout.txt

test/616-cha-regression-proxy-method/Android.bp

diff --git a/test/616-cha-regression-proxy-method/Android.bp b/test/616-cha-regression-proxy-method/Android.bp
index 2cf8807..fe57950 100644
--- a/test/616-cha-regression-proxy-method/Android.bp
+++ b/test/616-cha-regression-proxy-method/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-616-cha-regression-proxy-method-expected"],
+    data: [":art-run-test-616-cha-regression-proxy-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-616-cha-regression-proxy-method-expected",
-    out: ["art-run-test-616-cha-regression-proxy-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-616-cha-regression-proxy-method-expected-stdout",
+    out: ["art-run-test-616-cha-regression-proxy-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/616-cha-regression-proxy-method/expected-stdout.txt

diff --git a/test/616-cha-regression-proxy-method/expected.txt b/test/616-cha-regression-proxy-method/expected-stdout.txt
similarity index 100%
rename from test/616-cha-regression-proxy-method/expected.txt
rename to test/616-cha-regression-proxy-method/expected-stdout.txt

test/616-cha-unloading/expected-stdout.txt

diff --git a/test/616-cha-unloading/expected.txt b/test/616-cha-unloading/expected-stdout.txt
similarity index 100%
rename from test/616-cha-unloading/expected.txt
rename to test/616-cha-unloading/expected-stdout.txt

test/616-cha/Android.bp

diff --git a/test/616-cha/Android.bp b/test/616-cha/Android.bp
index 110135b..59b04ae 100644
--- a/test/616-cha/Android.bp
+++ b/test/616-cha/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-616-cha-expected"],
+    data: [":art-run-test-616-cha-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-616-cha-expected",
-    out: ["art-run-test-616-cha-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-616-cha-expected-stdout",
+    out: ["art-run-test-616-cha-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/616-cha/expected-stdout.txt

diff --git a/test/616-cha/expected.txt b/test/616-cha/expected-stdout.txt
similarity index 100%
rename from test/616-cha/expected.txt
rename to test/616-cha/expected-stdout.txt

test/617-clinit-oome/Android.bp

diff --git a/test/617-clinit-oome/Android.bp b/test/617-clinit-oome/Android.bp
index d60a39c..a7432e4 100644
--- a/test/617-clinit-oome/Android.bp
+++ b/test/617-clinit-oome/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-617-clinit-oome-expected"],
+    data: [":art-run-test-617-clinit-oome-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-617-clinit-oome-expected",
-    out: ["art-run-test-617-clinit-oome-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-617-clinit-oome-expected-stdout",
+    out: ["art-run-test-617-clinit-oome-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/617-clinit-oome/expected-stdout.txt

diff --git a/test/617-clinit-oome/expected.txt b/test/617-clinit-oome/expected-stdout.txt
similarity index 100%
rename from test/617-clinit-oome/expected.txt
rename to test/617-clinit-oome/expected-stdout.txt

test/618-checker-induction/Android.bp

diff --git a/test/618-checker-induction/Android.bp b/test/618-checker-induction/Android.bp
index e126d37..6eeebe2 100644
--- a/test/618-checker-induction/Android.bp
+++ b/test/618-checker-induction/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-618-checker-induction-expected"],
+    data: [":art-run-test-618-checker-induction-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-618-checker-induction-expected",
-    out: ["art-run-test-618-checker-induction-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-618-checker-induction-expected-stdout",
+    out: ["art-run-test-618-checker-induction-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/618-checker-induction/expected-stdout.txt

diff --git a/test/618-checker-induction/expected.txt b/test/618-checker-induction/expected-stdout.txt
similarity index 100%
rename from test/618-checker-induction/expected.txt
rename to test/618-checker-induction/expected-stdout.txt

test/619-checker-current-method/Android.bp

diff --git a/test/619-checker-current-method/Android.bp b/test/619-checker-current-method/Android.bp
index 40108a2..8411e6b 100644
--- a/test/619-checker-current-method/Android.bp
+++ b/test/619-checker-current-method/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-619-checker-current-method-expected"],
+    data: [":art-run-test-619-checker-current-method-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-619-checker-current-method-expected",
-    out: ["art-run-test-619-checker-current-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-619-checker-current-method-expected-stdout",
+    out: ["art-run-test-619-checker-current-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/619-checker-current-method/expected-stdout.txt

diff --git a/test/619-checker-current-method/expected.txt b/test/619-checker-current-method/expected-stdout.txt
similarity index 100%
rename from test/619-checker-current-method/expected.txt
rename to test/619-checker-current-method/expected-stdout.txt

test/620-checker-bce-intrinsics/Android.bp

diff --git a/test/620-checker-bce-intrinsics/Android.bp b/test/620-checker-bce-intrinsics/Android.bp
index 012ac7f..af2cd0c 100644
--- a/test/620-checker-bce-intrinsics/Android.bp
+++ b/test/620-checker-bce-intrinsics/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-620-checker-bce-intrinsics-expected"],
+    data: [":art-run-test-620-checker-bce-intrinsics-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-620-checker-bce-intrinsics-expected",
-    out: ["art-run-test-620-checker-bce-intrinsics-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-620-checker-bce-intrinsics-expected-stdout",
+    out: ["art-run-test-620-checker-bce-intrinsics-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/620-checker-bce-intrinsics/expected-stdout.txt

diff --git a/test/620-checker-bce-intrinsics/expected.txt b/test/620-checker-bce-intrinsics/expected-stdout.txt
similarity index 100%
rename from test/620-checker-bce-intrinsics/expected.txt
rename to test/620-checker-bce-intrinsics/expected-stdout.txt

test/622-checker-bce-regressions/Android.bp

diff --git a/test/622-checker-bce-regressions/Android.bp b/test/622-checker-bce-regressions/Android.bp
index 8a9823f..3df33ac 100644
--- a/test/622-checker-bce-regressions/Android.bp
+++ b/test/622-checker-bce-regressions/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-622-checker-bce-regressions-expected"],
+    data: [":art-run-test-622-checker-bce-regressions-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-622-checker-bce-regressions-expected",
-    out: ["art-run-test-622-checker-bce-regressions-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-622-checker-bce-regressions-expected-stdout",
+    out: ["art-run-test-622-checker-bce-regressions-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/622-checker-bce-regressions/expected-stdout.txt

diff --git a/test/622-checker-bce-regressions/expected.txt b/test/622-checker-bce-regressions/expected-stdout.txt
similarity index 100%
rename from test/622-checker-bce-regressions/expected.txt
rename to test/622-checker-bce-regressions/expected-stdout.txt

test/622-simplifyifs-exception-edges/expected-stdout.txt

diff --git a/test/622-simplifyifs-exception-edges/expected.txt b/test/622-simplifyifs-exception-edges/expected-stdout.txt
similarity index 100%
rename from test/622-simplifyifs-exception-edges/expected.txt
rename to test/622-simplifyifs-exception-edges/expected-stdout.txt

test/623-checker-loop-regressions/Android.bp

diff --git a/test/623-checker-loop-regressions/Android.bp b/test/623-checker-loop-regressions/Android.bp
index 7098e13..8bad36d 100644
--- a/test/623-checker-loop-regressions/Android.bp
+++ b/test/623-checker-loop-regressions/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-623-checker-loop-regressions-expected"],
+    data: [":art-run-test-623-checker-loop-regressions-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-623-checker-loop-regressions-expected",
-    out: ["art-run-test-623-checker-loop-regressions-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-623-checker-loop-regressions-expected-stdout",
+    out: ["art-run-test-623-checker-loop-regressions-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/623-checker-loop-regressions/expected-stdout.txt

diff --git a/test/623-checker-loop-regressions/expected.txt b/test/623-checker-loop-regressions/expected-stdout.txt
similarity index 100%
rename from test/623-checker-loop-regressions/expected.txt
rename to test/623-checker-loop-regressions/expected-stdout.txt

test/624-checker-stringops/expected-stdout.txt

diff --git a/test/624-checker-stringops/expected.txt b/test/624-checker-stringops/expected-stdout.txt
similarity index 100%
rename from test/624-checker-stringops/expected.txt
rename to test/624-checker-stringops/expected-stdout.txt

test/625-checker-licm-regressions/Android.bp

diff --git a/test/625-checker-licm-regressions/Android.bp b/test/625-checker-licm-regressions/Android.bp
index ea71b3e..2e95b5e 100644
--- a/test/625-checker-licm-regressions/Android.bp
+++ b/test/625-checker-licm-regressions/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-625-checker-licm-regressions-expected"],
+    data: [":art-run-test-625-checker-licm-regressions-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-625-checker-licm-regressions-expected",
-    out: ["art-run-test-625-checker-licm-regressions-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-625-checker-licm-regressions-expected-stdout",
+    out: ["art-run-test-625-checker-licm-regressions-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/625-checker-licm-regressions/expected-stdout.txt

diff --git a/test/625-checker-licm-regressions/expected.txt b/test/625-checker-licm-regressions/expected-stdout.txt
similarity index 100%
rename from test/625-checker-licm-regressions/expected.txt
rename to test/625-checker-licm-regressions/expected-stdout.txt

test/626-checker-arm64-scratch-register/expected-stdout.txt

diff --git a/test/626-checker-arm64-scratch-register/expected.txt b/test/626-checker-arm64-scratch-register/expected-stdout.txt
similarity index 100%
rename from test/626-checker-arm64-scratch-register/expected.txt
rename to test/626-checker-arm64-scratch-register/expected-stdout.txt

test/626-const-class-linking/expected-stdout.txt

diff --git a/test/626-const-class-linking/expected.txt b/test/626-const-class-linking/expected-stdout.txt
similarity index 100%
rename from test/626-const-class-linking/expected.txt
rename to test/626-const-class-linking/expected-stdout.txt

test/626-const-class-linking/src/Main.java

diff --git a/test/626-const-class-linking/src/Main.java b/test/626-const-class-linking/src/Main.java
index 1bc94a7..1541ab3 100644
--- a/test/626-const-class-linking/src/Main.java
+++ b/test/626-const-class-linking/src/Main.java
@@ -28,7 +28,7 @@
             System.loadLibrary(args[0]);
         } catch (ClassNotFoundException e) {
             usingRI = true;
-            // Add expected JNI_OnLoad log line to match expected.txt.
+            // Add expected JNI_OnLoad log line to match expected-stdout.txt.
             System.out.println("JNI_OnLoad called");
         }
 
@@ -107,7 +107,7 @@
         } catch (InvocationTargetException ite) {
             String message = ite.getCause().getMessage();
             if (usingRI && "Test".equals(message)) {
-              // Replace RI message with dalvik message to match expected.txt.
+              // Replace RI message with dalvik message to match expected-stdout.txt.
               message = "Initiating class loader of type " +
                   misbehaving_loader.getClass().getName() +
                   " returned class Helper2 instead of Test.";

test/626-set-resolved-string/Android.bp

diff --git a/test/626-set-resolved-string/Android.bp b/test/626-set-resolved-string/Android.bp
index a367111..b8fa91e 100644
--- a/test/626-set-resolved-string/Android.bp
+++ b/test/626-set-resolved-string/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-626-set-resolved-string-expected"],
+    data: [":art-run-test-626-set-resolved-string-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-626-set-resolved-string-expected",
-    out: ["art-run-test-626-set-resolved-string-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-626-set-resolved-string-expected-stdout",
+    out: ["art-run-test-626-set-resolved-string-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/626-set-resolved-string/expected-stdout.txt

diff --git a/test/626-set-resolved-string/expected.txt b/test/626-set-resolved-string/expected-stdout.txt
similarity index 100%
rename from test/626-set-resolved-string/expected.txt
rename to test/626-set-resolved-string/expected-stdout.txt

test/627-checker-unroll/Android.bp

diff --git a/test/627-checker-unroll/Android.bp b/test/627-checker-unroll/Android.bp
index c583cb4..3b93f94 100644
--- a/test/627-checker-unroll/Android.bp
+++ b/test/627-checker-unroll/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-627-checker-unroll-expected"],
+    data: [":art-run-test-627-checker-unroll-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-627-checker-unroll-expected",
-    out: ["art-run-test-627-checker-unroll-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-627-checker-unroll-expected-stdout",
+    out: ["art-run-test-627-checker-unroll-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/627-checker-unroll/expected-stdout.txt

diff --git a/test/627-checker-unroll/expected.txt b/test/627-checker-unroll/expected-stdout.txt
similarity index 100%
rename from test/627-checker-unroll/expected.txt
rename to test/627-checker-unroll/expected-stdout.txt

test/628-vdex/Android.bp

diff --git a/test/628-vdex/Android.bp b/test/628-vdex/Android.bp
index 8a0dc06..0433761 100644
--- a/test/628-vdex/Android.bp
+++ b/test/628-vdex/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-628-vdex-expected"],
+    data: [":art-run-test-628-vdex-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-628-vdex-expected",
-    out: ["art-run-test-628-vdex-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-628-vdex-expected-stdout",
+    out: ["art-run-test-628-vdex-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/628-vdex/expected-stdout.txt

diff --git a/test/628-vdex/expected.txt b/test/628-vdex/expected-stdout.txt
similarity index 100%
rename from test/628-vdex/expected.txt
rename to test/628-vdex/expected-stdout.txt

test/629-vdex-speed/Android.bp

diff --git a/test/629-vdex-speed/Android.bp b/test/629-vdex-speed/Android.bp
index aa1bb08..286fbd5 100644
--- a/test/629-vdex-speed/Android.bp
+++ b/test/629-vdex-speed/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-629-vdex-speed-expected"],
+    data: [":art-run-test-629-vdex-speed-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-629-vdex-speed-expected",
-    out: ["art-run-test-629-vdex-speed-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-629-vdex-speed-expected-stdout",
+    out: ["art-run-test-629-vdex-speed-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/629-vdex-speed/expected-stdout.txt

diff --git a/test/629-vdex-speed/expected.txt b/test/629-vdex-speed/expected-stdout.txt
similarity index 100%
rename from test/629-vdex-speed/expected.txt
rename to test/629-vdex-speed/expected-stdout.txt

test/630-safecast-array/expected-stdout.txt

diff --git a/test/630-safecast-array/expected.txt b/test/630-safecast-array/expected-stdout.txt
similarity index 100%
rename from test/630-safecast-array/expected.txt
rename to test/630-safecast-array/expected-stdout.txt

test/631-checker-get-class/Android.bp

diff --git a/test/631-checker-get-class/Android.bp b/test/631-checker-get-class/Android.bp
index 7226336..b19146d 100644
--- a/test/631-checker-get-class/Android.bp
+++ b/test/631-checker-get-class/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-631-checker-get-class-expected"],
+    data: [":art-run-test-631-checker-get-class-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-631-checker-get-class-expected",
-    out: ["art-run-test-631-checker-get-class-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-631-checker-get-class-expected-stdout",
+    out: ["art-run-test-631-checker-get-class-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/631-checker-get-class/expected-stdout.txt

diff --git a/test/631-checker-get-class/expected.txt b/test/631-checker-get-class/expected-stdout.txt
similarity index 100%
rename from test/631-checker-get-class/expected.txt
rename to test/631-checker-get-class/expected-stdout.txt

test/632-checker-char-at-bounds/Android.bp

diff --git a/test/632-checker-char-at-bounds/Android.bp b/test/632-checker-char-at-bounds/Android.bp
index 96831f2..c75e9d2 100644
--- a/test/632-checker-char-at-bounds/Android.bp
+++ b/test/632-checker-char-at-bounds/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-632-checker-char-at-bounds-expected"],
+    data: [":art-run-test-632-checker-char-at-bounds-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-632-checker-char-at-bounds-expected",
-    out: ["art-run-test-632-checker-char-at-bounds-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-632-checker-char-at-bounds-expected-stdout",
+    out: ["art-run-test-632-checker-char-at-bounds-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/632-checker-char-at-bounds/expected-stdout.txt

diff --git a/test/632-checker-char-at-bounds/expected.txt b/test/632-checker-char-at-bounds/expected-stdout.txt
similarity index 100%
rename from test/632-checker-char-at-bounds/expected.txt
rename to test/632-checker-char-at-bounds/expected-stdout.txt

test/633-checker-rtp-getclass/expected-stdout.txt

diff --git a/test/633-checker-rtp-getclass/expected.txt b/test/633-checker-rtp-getclass/expected-stdout.txt
similarity index 100%
rename from test/633-checker-rtp-getclass/expected.txt
rename to test/633-checker-rtp-getclass/expected-stdout.txt

test/634-vdex-duplicate/expected-stdout.txt

diff --git a/test/634-vdex-duplicate/expected.txt b/test/634-vdex-duplicate/expected-stdout.txt
similarity index 100%
rename from test/634-vdex-duplicate/expected.txt
rename to test/634-vdex-duplicate/expected-stdout.txt

test/635-checker-arm64-volatile-load-cc/Android.bp

diff --git a/test/635-checker-arm64-volatile-load-cc/Android.bp b/test/635-checker-arm64-volatile-load-cc/Android.bp
index c193565..c29ca2a 100644
--- a/test/635-checker-arm64-volatile-load-cc/Android.bp
+++ b/test/635-checker-arm64-volatile-load-cc/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-635-checker-arm64-volatile-load-cc-expected"],
+    data: [":art-run-test-635-checker-arm64-volatile-load-cc-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-635-checker-arm64-volatile-load-cc-expected",
-    out: ["art-run-test-635-checker-arm64-volatile-load-cc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-635-checker-arm64-volatile-load-cc-expected-stdout",
+    out: ["art-run-test-635-checker-arm64-volatile-load-cc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/635-checker-arm64-volatile-load-cc/expected-stdout.txt

diff --git a/test/635-checker-arm64-volatile-load-cc/expected.txt b/test/635-checker-arm64-volatile-load-cc/expected-stdout.txt
similarity index 100%
rename from test/635-checker-arm64-volatile-load-cc/expected.txt
rename to test/635-checker-arm64-volatile-load-cc/expected-stdout.txt

test/636-arm64-veneer-pool/Android.bp

diff --git a/test/636-arm64-veneer-pool/Android.bp b/test/636-arm64-veneer-pool/Android.bp
index 10d44e3..56ecb9e 100644
--- a/test/636-arm64-veneer-pool/Android.bp
+++ b/test/636-arm64-veneer-pool/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-636-arm64-veneer-pool-expected"],
+    data: [":art-run-test-636-arm64-veneer-pool-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-636-arm64-veneer-pool-expected",
-    out: ["art-run-test-636-arm64-veneer-pool-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-636-arm64-veneer-pool-expected-stdout",
+    out: ["art-run-test-636-arm64-veneer-pool-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/636-arm64-veneer-pool/expected-stdout.txt

diff --git a/test/636-arm64-veneer-pool/expected.txt b/test/636-arm64-veneer-pool/expected-stdout.txt
similarity index 100%
rename from test/636-arm64-veneer-pool/expected.txt
rename to test/636-arm64-veneer-pool/expected-stdout.txt

test/636-wrong-static-access/expected-stdout.txt

diff --git a/test/636-wrong-static-access/expected.txt b/test/636-wrong-static-access/expected-stdout.txt
similarity index 100%
rename from test/636-wrong-static-access/expected.txt
rename to test/636-wrong-static-access/expected-stdout.txt

test/637-checker-throw-inline/Android.bp

diff --git a/test/637-checker-throw-inline/Android.bp b/test/637-checker-throw-inline/Android.bp
index 3a71451..d05746a 100644
--- a/test/637-checker-throw-inline/Android.bp
+++ b/test/637-checker-throw-inline/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-637-checker-throw-inline-expected"],
+    data: [":art-run-test-637-checker-throw-inline-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-637-checker-throw-inline-expected",
-    out: ["art-run-test-637-checker-throw-inline-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-637-checker-throw-inline-expected-stdout",
+    out: ["art-run-test-637-checker-throw-inline-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/637-checker-throw-inline/expected-stdout.txt

diff --git a/test/637-checker-throw-inline/expected.txt b/test/637-checker-throw-inline/expected-stdout.txt
similarity index 100%
rename from test/637-checker-throw-inline/expected.txt
rename to test/637-checker-throw-inline/expected-stdout.txt

test/638-checker-inline-cache-intrinsic/Android.bp

diff --git a/test/638-checker-inline-cache-intrinsic/Android.bp b/test/638-checker-inline-cache-intrinsic/Android.bp
index a1a812d..6b7f1f2 100644
--- a/test/638-checker-inline-cache-intrinsic/Android.bp
+++ b/test/638-checker-inline-cache-intrinsic/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-638-checker-inline-cache-intrinsic-expected"],
+    data: [":art-run-test-638-checker-inline-cache-intrinsic-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-638-checker-inline-cache-intrinsic-expected",
-    out: ["art-run-test-638-checker-inline-cache-intrinsic-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-638-checker-inline-cache-intrinsic-expected-stdout",
+    out: ["art-run-test-638-checker-inline-cache-intrinsic-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/638-checker-inline-cache-intrinsic/expected-stdout.txt

diff --git a/test/638-checker-inline-cache-intrinsic/expected.txt b/test/638-checker-inline-cache-intrinsic/expected-stdout.txt
similarity index 100%
rename from test/638-checker-inline-cache-intrinsic/expected.txt
rename to test/638-checker-inline-cache-intrinsic/expected-stdout.txt

test/638-checker-inline-caches/expected-stdout.txt

diff --git a/test/638-checker-inline-caches/expected.txt b/test/638-checker-inline-caches/expected-stdout.txt
similarity index 100%
rename from test/638-checker-inline-caches/expected.txt
rename to test/638-checker-inline-caches/expected-stdout.txt

test/638-no-line-number/expected-stdout.txt

diff --git a/test/638-no-line-number/expected.txt b/test/638-no-line-number/expected-stdout.txt
similarity index 100%
rename from test/638-no-line-number/expected.txt
rename to test/638-no-line-number/expected-stdout.txt

test/639-checker-code-sinking/Android.bp

diff --git a/test/639-checker-code-sinking/Android.bp b/test/639-checker-code-sinking/Android.bp
index 2e35f9d..c7b7009 100644
--- a/test/639-checker-code-sinking/Android.bp
+++ b/test/639-checker-code-sinking/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-639-checker-code-sinking-expected"],
+    data: [":art-run-test-639-checker-code-sinking-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-639-checker-code-sinking-expected",
-    out: ["art-run-test-639-checker-code-sinking-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-639-checker-code-sinking-expected-stdout",
+    out: ["art-run-test-639-checker-code-sinking-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/639-checker-code-sinking/expected-stdout.txt

diff --git a/test/639-checker-code-sinking/expected.txt b/test/639-checker-code-sinking/expected-stdout.txt
similarity index 100%
rename from test/639-checker-code-sinking/expected.txt
rename to test/639-checker-code-sinking/expected-stdout.txt

test/640-checker-boolean-simd/Android.bp

diff --git a/test/640-checker-boolean-simd/Android.bp b/test/640-checker-boolean-simd/Android.bp
index cf2d2f0..18616cf 100644
--- a/test/640-checker-boolean-simd/Android.bp
+++ b/test/640-checker-boolean-simd/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-640-checker-boolean-simd-expected"],
+    data: [":art-run-test-640-checker-boolean-simd-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-640-checker-boolean-simd-expected",
-    out: ["art-run-test-640-checker-boolean-simd-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-640-checker-boolean-simd-expected-stdout",
+    out: ["art-run-test-640-checker-boolean-simd-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/640-checker-boolean-simd/expected-stdout.txt

diff --git a/test/640-checker-boolean-simd/expected.txt b/test/640-checker-boolean-simd/expected-stdout.txt
similarity index 100%
rename from test/640-checker-boolean-simd/expected.txt
rename to test/640-checker-boolean-simd/expected-stdout.txt

test/640-checker-integer-valueof/Android.bp

diff --git a/test/640-checker-integer-valueof/Android.bp b/test/640-checker-integer-valueof/Android.bp
index 97a15ac..63bcaf5 100644
--- a/test/640-checker-integer-valueof/Android.bp
+++ b/test/640-checker-integer-valueof/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-640-checker-integer-valueof-expected"],
+    data: [":art-run-test-640-checker-integer-valueof-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-640-checker-integer-valueof-expected",
-    out: ["art-run-test-640-checker-integer-valueof-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-640-checker-integer-valueof-expected-stdout",
+    out: ["art-run-test-640-checker-integer-valueof-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/640-checker-integer-valueof/expected-stdout.txt

diff --git a/test/640-checker-integer-valueof/expected.txt b/test/640-checker-integer-valueof/expected-stdout.txt
similarity index 100%
rename from test/640-checker-integer-valueof/expected.txt
rename to test/640-checker-integer-valueof/expected-stdout.txt

test/640-checker-simd/Android.bp

diff --git a/test/640-checker-simd/Android.bp b/test/640-checker-simd/Android.bp
index ae82368..e7cec56 100644
--- a/test/640-checker-simd/Android.bp
+++ b/test/640-checker-simd/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-640-checker-simd-expected"],
+    data: [":art-run-test-640-checker-simd-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-640-checker-simd-expected",
-    out: ["art-run-test-640-checker-simd-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-640-checker-simd-expected-stdout",
+    out: ["art-run-test-640-checker-simd-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/640-checker-simd/expected-stdout.txt

diff --git a/test/640-checker-simd/expected.txt b/test/640-checker-simd/expected-stdout.txt
similarity index 100%
rename from test/640-checker-simd/expected.txt
rename to test/640-checker-simd/expected-stdout.txt

test/641-checker-arraycopy/Android.bp

diff --git a/test/641-checker-arraycopy/Android.bp b/test/641-checker-arraycopy/Android.bp
index 600fbcf..b643053 100644
--- a/test/641-checker-arraycopy/Android.bp
+++ b/test/641-checker-arraycopy/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-641-checker-arraycopy-expected"],
+    data: [":art-run-test-641-checker-arraycopy-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-641-checker-arraycopy-expected",
-    out: ["art-run-test-641-checker-arraycopy-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-641-checker-arraycopy-expected-stdout",
+    out: ["art-run-test-641-checker-arraycopy-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/641-checker-arraycopy/expected-stdout.txt

diff --git a/test/641-checker-arraycopy/expected.txt b/test/641-checker-arraycopy/expected-stdout.txt
similarity index 100%
rename from test/641-checker-arraycopy/expected.txt
rename to test/641-checker-arraycopy/expected-stdout.txt

test/641-irreducible-inline/expected-stdout.txt

diff --git a/test/641-irreducible-inline/expected.txt b/test/641-irreducible-inline/expected-stdout.txt
similarity index 100%
rename from test/641-irreducible-inline/expected.txt
rename to test/641-irreducible-inline/expected-stdout.txt

test/641-iterations/Android.bp

diff --git a/test/641-iterations/Android.bp b/test/641-iterations/Android.bp
index 1de9a8f..40a20f6 100644
--- a/test/641-iterations/Android.bp
+++ b/test/641-iterations/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-641-iterations-expected"],
+    data: [":art-run-test-641-iterations-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-641-iterations-expected",
-    out: ["art-run-test-641-iterations-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-641-iterations-expected-stdout",
+    out: ["art-run-test-641-iterations-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/641-iterations/expected-stdout.txt

diff --git a/test/641-iterations/expected.txt b/test/641-iterations/expected-stdout.txt
similarity index 100%
rename from test/641-iterations/expected.txt
rename to test/641-iterations/expected-stdout.txt

test/642-fp-callees/Android.bp

diff --git a/test/642-fp-callees/Android.bp b/test/642-fp-callees/Android.bp
index 1af21ca..2ec92f0 100644
--- a/test/642-fp-callees/Android.bp
+++ b/test/642-fp-callees/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-642-fp-callees-expected"],
+    data: [":art-run-test-642-fp-callees-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-642-fp-callees-expected",
-    out: ["art-run-test-642-fp-callees-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-642-fp-callees-expected-stdout",
+    out: ["art-run-test-642-fp-callees-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/642-fp-callees/expected-stdout.txt

diff --git a/test/642-fp-callees/expected.txt b/test/642-fp-callees/expected-stdout.txt
similarity index 100%
rename from test/642-fp-callees/expected.txt
rename to test/642-fp-callees/expected-stdout.txt

test/643-checker-bogus-ic/Android.bp

diff --git a/test/643-checker-bogus-ic/Android.bp b/test/643-checker-bogus-ic/Android.bp
index 17656f0..612a003 100644
--- a/test/643-checker-bogus-ic/Android.bp
+++ b/test/643-checker-bogus-ic/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-643-checker-bogus-ic-expected"],
+    data: [":art-run-test-643-checker-bogus-ic-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-643-checker-bogus-ic-expected",
-    out: ["art-run-test-643-checker-bogus-ic-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-643-checker-bogus-ic-expected-stdout",
+    out: ["art-run-test-643-checker-bogus-ic-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/643-checker-bogus-ic/expected-stdout.txt

diff --git a/test/643-checker-bogus-ic/expected.txt b/test/643-checker-bogus-ic/expected-stdout.txt
similarity index 100%
rename from test/643-checker-bogus-ic/expected.txt
rename to test/643-checker-bogus-ic/expected-stdout.txt

test/645-checker-abs-simd/Android.bp

diff --git a/test/645-checker-abs-simd/Android.bp b/test/645-checker-abs-simd/Android.bp
index 1cfb950..624d1fb 100644
--- a/test/645-checker-abs-simd/Android.bp
+++ b/test/645-checker-abs-simd/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-645-checker-abs-simd-expected"],
+    data: [":art-run-test-645-checker-abs-simd-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-645-checker-abs-simd-expected",
-    out: ["art-run-test-645-checker-abs-simd-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-645-checker-abs-simd-expected-stdout",
+    out: ["art-run-test-645-checker-abs-simd-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/645-checker-abs-simd/expected-stdout.txt

diff --git a/test/645-checker-abs-simd/expected.txt b/test/645-checker-abs-simd/expected-stdout.txt
similarity index 100%
rename from test/645-checker-abs-simd/expected.txt
rename to test/645-checker-abs-simd/expected-stdout.txt

test/646-checker-arraycopy-large-cst-pos/Android.bp

diff --git a/test/646-checker-arraycopy-large-cst-pos/Android.bp b/test/646-checker-arraycopy-large-cst-pos/Android.bp
index ea7481b..93a1c07 100644
--- a/test/646-checker-arraycopy-large-cst-pos/Android.bp
+++ b/test/646-checker-arraycopy-large-cst-pos/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-646-checker-arraycopy-large-cst-pos-expected"],
+    data: [":art-run-test-646-checker-arraycopy-large-cst-pos-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-646-checker-arraycopy-large-cst-pos-expected",
-    out: ["art-run-test-646-checker-arraycopy-large-cst-pos-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-646-checker-arraycopy-large-cst-pos-expected-stdout",
+    out: ["art-run-test-646-checker-arraycopy-large-cst-pos-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/646-checker-arraycopy-large-cst-pos/expected-stdout.txt

diff --git a/test/646-checker-arraycopy-large-cst-pos/expected.txt b/test/646-checker-arraycopy-large-cst-pos/expected-stdout.txt
similarity index 100%
rename from test/646-checker-arraycopy-large-cst-pos/expected.txt
rename to test/646-checker-arraycopy-large-cst-pos/expected-stdout.txt

test/646-checker-long-const-to-int/Android.bp

diff --git a/test/646-checker-long-const-to-int/Android.bp b/test/646-checker-long-const-to-int/Android.bp
index 6ba7740..7d8af91 100644
--- a/test/646-checker-long-const-to-int/Android.bp
+++ b/test/646-checker-long-const-to-int/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-646-checker-long-const-to-int-expected"],
+    data: [":art-run-test-646-checker-long-const-to-int-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-646-checker-long-const-to-int-expected",
-    out: ["art-run-test-646-checker-long-const-to-int-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-646-checker-long-const-to-int-expected-stdout",
+    out: ["art-run-test-646-checker-long-const-to-int-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/646-checker-long-const-to-int/expected-stdout.txt

diff --git a/test/646-checker-long-const-to-int/expected.txt b/test/646-checker-long-const-to-int/expected-stdout.txt
similarity index 100%
rename from test/646-checker-long-const-to-int/expected.txt
rename to test/646-checker-long-const-to-int/expected-stdout.txt

test/646-checker-simd-hadd/Android.bp

diff --git a/test/646-checker-simd-hadd/Android.bp b/test/646-checker-simd-hadd/Android.bp
index 1fc4298..7927752 100644
--- a/test/646-checker-simd-hadd/Android.bp
+++ b/test/646-checker-simd-hadd/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-646-checker-simd-hadd-expected"],
+    data: [":art-run-test-646-checker-simd-hadd-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-646-checker-simd-hadd-expected",
-    out: ["art-run-test-646-checker-simd-hadd-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-646-checker-simd-hadd-expected-stdout",
+    out: ["art-run-test-646-checker-simd-hadd-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/646-checker-simd-hadd/expected-stdout.txt

diff --git a/test/646-checker-simd-hadd/expected.txt b/test/646-checker-simd-hadd/expected-stdout.txt
similarity index 100%
rename from test/646-checker-simd-hadd/expected.txt
rename to test/646-checker-simd-hadd/expected-stdout.txt

test/647-jni-get-field-id/Android.bp

diff --git a/test/647-jni-get-field-id/Android.bp b/test/647-jni-get-field-id/Android.bp
index 482aa39..a63ac8c 100644
--- a/test/647-jni-get-field-id/Android.bp
+++ b/test/647-jni-get-field-id/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-647-jni-get-field-id-expected"],
+    data: [":art-run-test-647-jni-get-field-id-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-647-jni-get-field-id-expected",
-    out: ["art-run-test-647-jni-get-field-id-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-647-jni-get-field-id-expected-stdout",
+    out: ["art-run-test-647-jni-get-field-id-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/647-jni-get-field-id/expected-stdout.txt

diff --git a/test/647-jni-get-field-id/expected.txt b/test/647-jni-get-field-id/expected-stdout.txt
similarity index 100%
rename from test/647-jni-get-field-id/expected.txt
rename to test/647-jni-get-field-id/expected-stdout.txt

test/647-sinking-catch/expected-stdout.txt

diff --git a/test/647-sinking-catch/expected.txt b/test/647-sinking-catch/expected-stdout.txt
similarity index 100%
rename from test/647-sinking-catch/expected.txt
rename to test/647-sinking-catch/expected-stdout.txt

test/648-inline-caches-unresolved/expected-stdout.txt

diff --git a/test/648-inline-caches-unresolved/expected.txt b/test/648-inline-caches-unresolved/expected-stdout.txt
similarity index 100%
rename from test/648-inline-caches-unresolved/expected.txt
rename to test/648-inline-caches-unresolved/expected-stdout.txt

test/648-many-direct-methods/expected-stdout.txt

diff --git a/test/648-many-direct-methods/expected.txt b/test/648-many-direct-methods/expected-stdout.txt
similarity index 100%
rename from test/648-many-direct-methods/expected.txt
rename to test/648-many-direct-methods/expected-stdout.txt

test/649-vdex-duplicate-method/expected-stdout.txt

diff --git a/test/649-vdex-duplicate-method/expected.txt b/test/649-vdex-duplicate-method/expected-stdout.txt
similarity index 100%
rename from test/649-vdex-duplicate-method/expected.txt
rename to test/649-vdex-duplicate-method/expected-stdout.txt

test/650-checker-inline-access-thunks/Android.bp

diff --git a/test/650-checker-inline-access-thunks/Android.bp b/test/650-checker-inline-access-thunks/Android.bp
index 3e35635..a08824e 100644
--- a/test/650-checker-inline-access-thunks/Android.bp
+++ b/test/650-checker-inline-access-thunks/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-650-checker-inline-access-thunks-expected"],
+    data: [":art-run-test-650-checker-inline-access-thunks-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-650-checker-inline-access-thunks-expected",
-    out: ["art-run-test-650-checker-inline-access-thunks-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-650-checker-inline-access-thunks-expected-stdout",
+    out: ["art-run-test-650-checker-inline-access-thunks-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/650-checker-inline-access-thunks/expected-stdout.txt

diff --git a/test/650-checker-inline-access-thunks/expected.txt b/test/650-checker-inline-access-thunks/expected-stdout.txt
similarity index 100%
rename from test/650-checker-inline-access-thunks/expected.txt
rename to test/650-checker-inline-access-thunks/expected-stdout.txt

test/652-deopt-intrinsic/Android.bp

diff --git a/test/652-deopt-intrinsic/Android.bp b/test/652-deopt-intrinsic/Android.bp
index 30e891a..65d3af7 100644
--- a/test/652-deopt-intrinsic/Android.bp
+++ b/test/652-deopt-intrinsic/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-652-deopt-intrinsic-expected"],
+    data: [":art-run-test-652-deopt-intrinsic-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-652-deopt-intrinsic-expected",
-    out: ["art-run-test-652-deopt-intrinsic-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-652-deopt-intrinsic-expected-stdout",
+    out: ["art-run-test-652-deopt-intrinsic-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/652-deopt-intrinsic/expected-stdout.txt

diff --git a/test/652-deopt-intrinsic/expected.txt b/test/652-deopt-intrinsic/expected-stdout.txt
similarity index 100%
rename from test/652-deopt-intrinsic/expected.txt
rename to test/652-deopt-intrinsic/expected-stdout.txt

test/654-checker-periodic/Android.bp

diff --git a/test/654-checker-periodic/Android.bp b/test/654-checker-periodic/Android.bp
index 6ab0be0..6381ddc 100644
--- a/test/654-checker-periodic/Android.bp
+++ b/test/654-checker-periodic/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-654-checker-periodic-expected"],
+    data: [":art-run-test-654-checker-periodic-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-654-checker-periodic-expected",
-    out: ["art-run-test-654-checker-periodic-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-654-checker-periodic-expected-stdout",
+    out: ["art-run-test-654-checker-periodic-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/654-checker-periodic/expected-stdout.txt

diff --git a/test/654-checker-periodic/expected.txt b/test/654-checker-periodic/expected-stdout.txt
similarity index 100%
rename from test/654-checker-periodic/expected.txt
rename to test/654-checker-periodic/expected-stdout.txt

test/655-checker-simd-arm-opt/Android.bp

diff --git a/test/655-checker-simd-arm-opt/Android.bp b/test/655-checker-simd-arm-opt/Android.bp
index e6b3aa8..8cd851a 100644
--- a/test/655-checker-simd-arm-opt/Android.bp
+++ b/test/655-checker-simd-arm-opt/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-655-checker-simd-arm-opt-expected"],
+    data: [":art-run-test-655-checker-simd-arm-opt-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-655-checker-simd-arm-opt-expected",
-    out: ["art-run-test-655-checker-simd-arm-opt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-655-checker-simd-arm-opt-expected-stdout",
+    out: ["art-run-test-655-checker-simd-arm-opt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/655-checker-simd-arm-opt/expected-stdout.txt

diff --git a/test/655-checker-simd-arm-opt/expected.txt b/test/655-checker-simd-arm-opt/expected-stdout.txt
similarity index 100%
rename from test/655-checker-simd-arm-opt/expected.txt
rename to test/655-checker-simd-arm-opt/expected-stdout.txt

test/655-jit-clinit/Android.bp

diff --git a/test/655-jit-clinit/Android.bp b/test/655-jit-clinit/Android.bp
index 8dbc7e8..a9be307 100644
--- a/test/655-jit-clinit/Android.bp
+++ b/test/655-jit-clinit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-655-jit-clinit-expected"],
+    data: [":art-run-test-655-jit-clinit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-655-jit-clinit-expected",
-    out: ["art-run-test-655-jit-clinit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-655-jit-clinit-expected-stdout",
+    out: ["art-run-test-655-jit-clinit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/655-jit-clinit/expected-stdout.txt

diff --git a/test/655-jit-clinit/expected.txt b/test/655-jit-clinit/expected-stdout.txt
similarity index 100%
rename from test/655-jit-clinit/expected.txt
rename to test/655-jit-clinit/expected-stdout.txt

test/656-annotation-lookup-generic-jni/expected-stdout.txt

diff --git a/test/656-annotation-lookup-generic-jni/expected.txt b/test/656-annotation-lookup-generic-jni/expected-stdout.txt
similarity index 100%
rename from test/656-annotation-lookup-generic-jni/expected.txt
rename to test/656-annotation-lookup-generic-jni/expected-stdout.txt

test/656-checker-simd-opt/Android.bp

diff --git a/test/656-checker-simd-opt/Android.bp b/test/656-checker-simd-opt/Android.bp
index 7429759..098dac4 100644
--- a/test/656-checker-simd-opt/Android.bp
+++ b/test/656-checker-simd-opt/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-656-checker-simd-opt-expected"],
+    data: [":art-run-test-656-checker-simd-opt-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-656-checker-simd-opt-expected",
-    out: ["art-run-test-656-checker-simd-opt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-656-checker-simd-opt-expected-stdout",
+    out: ["art-run-test-656-checker-simd-opt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/656-checker-simd-opt/expected-stdout.txt

diff --git a/test/656-checker-simd-opt/expected.txt b/test/656-checker-simd-opt/expected-stdout.txt
similarity index 100%
rename from test/656-checker-simd-opt/expected.txt
rename to test/656-checker-simd-opt/expected-stdout.txt

test/656-loop-deopt/Android.bp

diff --git a/test/656-loop-deopt/Android.bp b/test/656-loop-deopt/Android.bp
index a5dc816..b4c45b8 100644
--- a/test/656-loop-deopt/Android.bp
+++ b/test/656-loop-deopt/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-656-loop-deopt-expected"],
+    data: [":art-run-test-656-loop-deopt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-656-loop-deopt-expected",
-    out: ["art-run-test-656-loop-deopt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-656-loop-deopt-expected-stdout",
+    out: ["art-run-test-656-loop-deopt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/656-loop-deopt/expected-stdout.txt

diff --git a/test/656-loop-deopt/expected.txt b/test/656-loop-deopt/expected-stdout.txt
similarity index 100%
rename from test/656-loop-deopt/expected.txt
rename to test/656-loop-deopt/expected-stdout.txt

test/657-branches/Android.bp

diff --git a/test/657-branches/Android.bp b/test/657-branches/Android.bp
index e384db8..889063d 100644
--- a/test/657-branches/Android.bp
+++ b/test/657-branches/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-657-branches-expected"],
+    data: [":art-run-test-657-branches-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-657-branches-expected",
-    out: ["art-run-test-657-branches-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-657-branches-expected-stdout",
+    out: ["art-run-test-657-branches-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/657-branches/expected-stdout.txt

diff --git a/test/657-branches/expected.txt b/test/657-branches/expected-stdout.txt
similarity index 100%
rename from test/657-branches/expected.txt
rename to test/657-branches/expected-stdout.txt

test/658-fp-read-barrier/Android.bp

diff --git a/test/658-fp-read-barrier/Android.bp b/test/658-fp-read-barrier/Android.bp
index e93878f..9372125 100644
--- a/test/658-fp-read-barrier/Android.bp
+++ b/test/658-fp-read-barrier/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-658-fp-read-barrier-expected"],
+    data: [":art-run-test-658-fp-read-barrier-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-658-fp-read-barrier-expected",
-    out: ["art-run-test-658-fp-read-barrier-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-658-fp-read-barrier-expected-stdout",
+    out: ["art-run-test-658-fp-read-barrier-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/658-fp-read-barrier/expected-stdout.txt

diff --git a/test/658-fp-read-barrier/expected.txt b/test/658-fp-read-barrier/expected-stdout.txt
similarity index 100%
rename from test/658-fp-read-barrier/expected.txt
rename to test/658-fp-read-barrier/expected-stdout.txt

test/659-unpadded-array/expected-stdout.txt

diff --git a/test/659-unpadded-array/expected.txt b/test/659-unpadded-array/expected-stdout.txt
similarity index 100%
rename from test/659-unpadded-array/expected.txt
rename to test/659-unpadded-array/expected-stdout.txt

test/660-checker-sad/Android.bp

diff --git a/test/660-checker-sad/Android.bp b/test/660-checker-sad/Android.bp
index 4045182..bcaa1c0 100644
--- a/test/660-checker-sad/Android.bp
+++ b/test/660-checker-sad/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-660-checker-sad-expected"],
+    data: [":art-run-test-660-checker-sad-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-660-checker-sad-expected",
-    out: ["art-run-test-660-checker-sad-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-660-checker-sad-expected-stdout",
+    out: ["art-run-test-660-checker-sad-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/660-checker-sad/expected-stdout.txt

diff --git a/test/660-checker-sad/expected.txt b/test/660-checker-sad/expected-stdout.txt
similarity index 100%
rename from test/660-checker-sad/expected.txt
rename to test/660-checker-sad/expected-stdout.txt

test/660-checker-simd-sad/Android.bp

diff --git a/test/660-checker-simd-sad/Android.bp b/test/660-checker-simd-sad/Android.bp
index 9b15b52..cf99f97 100644
--- a/test/660-checker-simd-sad/Android.bp
+++ b/test/660-checker-simd-sad/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-660-checker-simd-sad-expected"],
+    data: [":art-run-test-660-checker-simd-sad-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-660-checker-simd-sad-expected",
-    out: ["art-run-test-660-checker-simd-sad-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-660-checker-simd-sad-expected-stdout",
+    out: ["art-run-test-660-checker-simd-sad-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/660-checker-simd-sad/expected-stdout.txt

diff --git a/test/660-checker-simd-sad/expected.txt b/test/660-checker-simd-sad/expected-stdout.txt
similarity index 100%
rename from test/660-checker-simd-sad/expected.txt
rename to test/660-checker-simd-sad/expected-stdout.txt

test/660-clinit/Android.bp

diff --git a/test/660-clinit/Android.bp b/test/660-clinit/Android.bp
index 2e32596..a6f9bd9 100644
--- a/test/660-clinit/Android.bp
+++ b/test/660-clinit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-660-clinit-expected"],
+    data: [":art-run-test-660-clinit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-660-clinit-expected",
-    out: ["art-run-test-660-clinit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-660-clinit-expected-stdout",
+    out: ["art-run-test-660-clinit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/660-clinit/expected-stdout.txt

diff --git a/test/660-clinit/expected.txt b/test/660-clinit/expected-stdout.txt
similarity index 100%
rename from test/660-clinit/expected.txt
rename to test/660-clinit/expected-stdout.txt

test/660-store-8-16/expected-stdout.txt

diff --git a/test/660-store-8-16/expected.txt b/test/660-store-8-16/expected-stdout.txt
similarity index 100%
rename from test/660-store-8-16/expected.txt
rename to test/660-store-8-16/expected-stdout.txt

test/661-checker-simd-reduc/Android.bp

diff --git a/test/661-checker-simd-reduc/Android.bp b/test/661-checker-simd-reduc/Android.bp
index 7be8f9e..ce4da4e 100644
--- a/test/661-checker-simd-reduc/Android.bp
+++ b/test/661-checker-simd-reduc/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-661-checker-simd-reduc-expected"],
+    data: [":art-run-test-661-checker-simd-reduc-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-661-checker-simd-reduc-expected",
-    out: ["art-run-test-661-checker-simd-reduc-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-661-checker-simd-reduc-expected-stdout",
+    out: ["art-run-test-661-checker-simd-reduc-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/661-checker-simd-reduc/expected-stdout.txt

diff --git a/test/661-checker-simd-reduc/expected.txt b/test/661-checker-simd-reduc/expected-stdout.txt
similarity index 100%
rename from test/661-checker-simd-reduc/expected.txt
rename to test/661-checker-simd-reduc/expected-stdout.txt

test/661-classloader-allocator/expected-stdout.txt

diff --git a/test/661-classloader-allocator/expected.txt b/test/661-classloader-allocator/expected-stdout.txt
similarity index 100%
rename from test/661-classloader-allocator/expected.txt
rename to test/661-classloader-allocator/expected-stdout.txt

test/661-oat-writer-layout/Android.bp

diff --git a/test/661-oat-writer-layout/Android.bp b/test/661-oat-writer-layout/Android.bp
index fecfd37..44f18f6 100644
--- a/test/661-oat-writer-layout/Android.bp
+++ b/test/661-oat-writer-layout/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-661-oat-writer-layout-expected"],
+    data: [":art-run-test-661-oat-writer-layout-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-661-oat-writer-layout-expected",
-    out: ["art-run-test-661-oat-writer-layout-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-661-oat-writer-layout-expected-stdout",
+    out: ["art-run-test-661-oat-writer-layout-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/661-oat-writer-layout/expected-stdout.txt

diff --git a/test/661-oat-writer-layout/expected.txt b/test/661-oat-writer-layout/expected-stdout.txt
similarity index 100%
rename from test/661-oat-writer-layout/expected.txt
rename to test/661-oat-writer-layout/expected-stdout.txt

test/662-regression-alias/Android.bp

diff --git a/test/662-regression-alias/Android.bp b/test/662-regression-alias/Android.bp
index a2ce3a2..b24ed72 100644
--- a/test/662-regression-alias/Android.bp
+++ b/test/662-regression-alias/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-662-regression-alias-expected"],
+    data: [":art-run-test-662-regression-alias-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-662-regression-alias-expected",
-    out: ["art-run-test-662-regression-alias-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-662-regression-alias-expected-stdout",
+    out: ["art-run-test-662-regression-alias-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/662-regression-alias/expected-stdout.txt

diff --git a/test/662-regression-alias/expected.txt b/test/662-regression-alias/expected-stdout.txt
similarity index 100%
rename from test/662-regression-alias/expected.txt
rename to test/662-regression-alias/expected-stdout.txt

test/663-checker-select-generator/expected-stdout.txt

diff --git a/test/663-checker-select-generator/expected.txt b/test/663-checker-select-generator/expected-stdout.txt
similarity index 100%
rename from test/663-checker-select-generator/expected.txt
rename to test/663-checker-select-generator/expected-stdout.txt

test/663-odd-dex-size/expected-stdout.txt

diff --git a/test/663-odd-dex-size/expected.txt b/test/663-odd-dex-size/expected-stdout.txt
similarity index 100%
rename from test/663-odd-dex-size/expected.txt
rename to test/663-odd-dex-size/expected-stdout.txt

test/663-odd-dex-size2/expected-stdout.txt

diff --git a/test/663-odd-dex-size2/expected.txt b/test/663-odd-dex-size2/expected-stdout.txt
similarity index 100%
rename from test/663-odd-dex-size2/expected.txt
rename to test/663-odd-dex-size2/expected-stdout.txt

test/663-odd-dex-size3/expected-stdout.txt

diff --git a/test/663-odd-dex-size3/expected.txt b/test/663-odd-dex-size3/expected-stdout.txt
similarity index 100%
rename from test/663-odd-dex-size3/expected.txt
rename to test/663-odd-dex-size3/expected-stdout.txt

test/663-odd-dex-size4/expected-stdout.txt

diff --git a/test/663-odd-dex-size4/expected.txt b/test/663-odd-dex-size4/expected-stdout.txt
similarity index 100%
rename from test/663-odd-dex-size4/expected.txt
rename to test/663-odd-dex-size4/expected-stdout.txt

test/664-aget-verifier/Android.bp

diff --git a/test/664-aget-verifier/Android.bp b/test/664-aget-verifier/Android.bp
index a4ae4ea..011fdc8 100644
--- a/test/664-aget-verifier/Android.bp
+++ b/test/664-aget-verifier/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-664-aget-verifier-expected"],
+    data: [":art-run-test-664-aget-verifier-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-664-aget-verifier-expected",
-    out: ["art-run-test-664-aget-verifier-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-664-aget-verifier-expected-stdout",
+    out: ["art-run-test-664-aget-verifier-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/664-aget-verifier/expected-stdout.txt

diff --git a/test/664-aget-verifier/expected.txt b/test/664-aget-verifier/expected-stdout.txt
similarity index 100%
rename from test/664-aget-verifier/expected.txt
rename to test/664-aget-verifier/expected-stdout.txt

test/665-checker-simd-zero/Android.bp

diff --git a/test/665-checker-simd-zero/Android.bp b/test/665-checker-simd-zero/Android.bp
index 99d8a4c..45bae13 100644
--- a/test/665-checker-simd-zero/Android.bp
+++ b/test/665-checker-simd-zero/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-665-checker-simd-zero-expected"],
+    data: [":art-run-test-665-checker-simd-zero-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-665-checker-simd-zero-expected",
-    out: ["art-run-test-665-checker-simd-zero-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-665-checker-simd-zero-expected-stdout",
+    out: ["art-run-test-665-checker-simd-zero-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/665-checker-simd-zero/expected-stdout.txt

diff --git a/test/665-checker-simd-zero/expected.txt b/test/665-checker-simd-zero/expected-stdout.txt
similarity index 100%
rename from test/665-checker-simd-zero/expected.txt
rename to test/665-checker-simd-zero/expected-stdout.txt

test/666-dex-cache-itf/Android.bp

diff --git a/test/666-dex-cache-itf/Android.bp b/test/666-dex-cache-itf/Android.bp
index da3105f..4544b95 100644
--- a/test/666-dex-cache-itf/Android.bp
+++ b/test/666-dex-cache-itf/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-666-dex-cache-itf-expected"],
+    data: [":art-run-test-666-dex-cache-itf-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-666-dex-cache-itf-expected",
-    out: ["art-run-test-666-dex-cache-itf-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-666-dex-cache-itf-expected-stdout",
+    out: ["art-run-test-666-dex-cache-itf-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/666-dex-cache-itf/expected-stdout.txt

diff --git a/test/666-dex-cache-itf/expected.txt b/test/666-dex-cache-itf/expected-stdout.txt
similarity index 100%
rename from test/666-dex-cache-itf/expected.txt
rename to test/666-dex-cache-itf/expected-stdout.txt

test/667-checker-simd-alignment/Android.bp

diff --git a/test/667-checker-simd-alignment/Android.bp b/test/667-checker-simd-alignment/Android.bp
index 195cb99..d5c6586 100644
--- a/test/667-checker-simd-alignment/Android.bp
+++ b/test/667-checker-simd-alignment/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-667-checker-simd-alignment-expected"],
+    data: [":art-run-test-667-checker-simd-alignment-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-667-checker-simd-alignment-expected",
-    out: ["art-run-test-667-checker-simd-alignment-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-667-checker-simd-alignment-expected-stdout",
+    out: ["art-run-test-667-checker-simd-alignment-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/667-checker-simd-alignment/expected-stdout.txt

diff --git a/test/667-checker-simd-alignment/expected.txt b/test/667-checker-simd-alignment/expected-stdout.txt
similarity index 100%
rename from test/667-checker-simd-alignment/expected.txt
rename to test/667-checker-simd-alignment/expected-stdout.txt

test/667-jit-jni-stub/Android.bp

diff --git a/test/667-jit-jni-stub/Android.bp b/test/667-jit-jni-stub/Android.bp
index c8edf82..fe7ff5d 100644
--- a/test/667-jit-jni-stub/Android.bp
+++ b/test/667-jit-jni-stub/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-667-jit-jni-stub-expected"],
+    data: [":art-run-test-667-jit-jni-stub-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-667-jit-jni-stub-expected",
-    out: ["art-run-test-667-jit-jni-stub-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-667-jit-jni-stub-expected-stdout",
+    out: ["art-run-test-667-jit-jni-stub-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/667-jit-jni-stub/expected-stdout.txt

diff --git a/test/667-jit-jni-stub/expected.txt b/test/667-jit-jni-stub/expected-stdout.txt
similarity index 100%
rename from test/667-jit-jni-stub/expected.txt
rename to test/667-jit-jni-stub/expected-stdout.txt

test/667-out-of-bounds/Android.bp

diff --git a/test/667-out-of-bounds/Android.bp b/test/667-out-of-bounds/Android.bp
index b163fd9..0c124c1 100644
--- a/test/667-out-of-bounds/Android.bp
+++ b/test/667-out-of-bounds/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-667-out-of-bounds-expected"],
+    data: [":art-run-test-667-out-of-bounds-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-667-out-of-bounds-expected",
-    out: ["art-run-test-667-out-of-bounds-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-667-out-of-bounds-expected-stdout",
+    out: ["art-run-test-667-out-of-bounds-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/667-out-of-bounds/expected-stdout.txt

diff --git a/test/667-out-of-bounds/expected.txt b/test/667-out-of-bounds/expected-stdout.txt
similarity index 100%
rename from test/667-out-of-bounds/expected.txt
rename to test/667-out-of-bounds/expected-stdout.txt

test/668-aiobe/expected-stdout.txt

diff --git a/test/668-aiobe/expected.txt b/test/668-aiobe/expected-stdout.txt
similarity index 100%
rename from test/668-aiobe/expected.txt
rename to test/668-aiobe/expected-stdout.txt

test/669-checker-break/Android.bp

diff --git a/test/669-checker-break/Android.bp b/test/669-checker-break/Android.bp
index e6ac50c..57bfac8 100644
--- a/test/669-checker-break/Android.bp
+++ b/test/669-checker-break/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-669-checker-break-expected"],
+    data: [":art-run-test-669-checker-break-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-669-checker-break-expected",
-    out: ["art-run-test-669-checker-break-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-669-checker-break-expected-stdout",
+    out: ["art-run-test-669-checker-break-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/669-checker-break/expected-stdout.txt

diff --git a/test/669-checker-break/expected.txt b/test/669-checker-break/expected-stdout.txt
similarity index 100%
rename from test/669-checker-break/expected.txt
rename to test/669-checker-break/expected-stdout.txt

test/670-bitstring-type-check/expected-stdout.txt

diff --git a/test/670-bitstring-type-check/expected.txt b/test/670-bitstring-type-check/expected-stdout.txt
similarity index 100%
rename from test/670-bitstring-type-check/expected.txt
rename to test/670-bitstring-type-check/expected-stdout.txt

test/671-npe-field-opts/Android.bp

diff --git a/test/671-npe-field-opts/Android.bp b/test/671-npe-field-opts/Android.bp
index ca0545f..7362f4a 100644
--- a/test/671-npe-field-opts/Android.bp
+++ b/test/671-npe-field-opts/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-671-npe-field-opts-expected"],
+    data: [":art-run-test-671-npe-field-opts-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-671-npe-field-opts-expected",
-    out: ["art-run-test-671-npe-field-opts-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-671-npe-field-opts-expected-stdout",
+    out: ["art-run-test-671-npe-field-opts-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/671-npe-field-opts/expected-stdout.txt

diff --git a/test/671-npe-field-opts/expected.txt b/test/671-npe-field-opts/expected-stdout.txt
similarity index 100%
rename from test/671-npe-field-opts/expected.txt
rename to test/671-npe-field-opts/expected-stdout.txt

test/672-checker-throw-method/Android.bp

diff --git a/test/672-checker-throw-method/Android.bp b/test/672-checker-throw-method/Android.bp
index 64b16cc..1381d4c 100644
--- a/test/672-checker-throw-method/Android.bp
+++ b/test/672-checker-throw-method/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-672-checker-throw-method-expected"],
+    data: [":art-run-test-672-checker-throw-method-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-672-checker-throw-method-expected",
-    out: ["art-run-test-672-checker-throw-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-672-checker-throw-method-expected-stdout",
+    out: ["art-run-test-672-checker-throw-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/672-checker-throw-method/expected-stdout.txt

diff --git a/test/672-checker-throw-method/expected.txt b/test/672-checker-throw-method/expected-stdout.txt
similarity index 100%
rename from test/672-checker-throw-method/expected.txt
rename to test/672-checker-throw-method/expected-stdout.txt

test/673-checker-throw-vmethod/Android.bp

diff --git a/test/673-checker-throw-vmethod/Android.bp b/test/673-checker-throw-vmethod/Android.bp
index 681f0a0..66e78e0 100644
--- a/test/673-checker-throw-vmethod/Android.bp
+++ b/test/673-checker-throw-vmethod/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-673-checker-throw-vmethod-expected"],
+    data: [":art-run-test-673-checker-throw-vmethod-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-673-checker-throw-vmethod-expected",
-    out: ["art-run-test-673-checker-throw-vmethod-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-673-checker-throw-vmethod-expected-stdout",
+    out: ["art-run-test-673-checker-throw-vmethod-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/673-checker-throw-vmethod/expected-stdout.txt

diff --git a/test/673-checker-throw-vmethod/expected.txt b/test/673-checker-throw-vmethod/expected-stdout.txt
similarity index 100%
rename from test/673-checker-throw-vmethod/expected.txt
rename to test/673-checker-throw-vmethod/expected-stdout.txt

test/674-HelloWorld-Dm/Android.bp

diff --git a/test/674-HelloWorld-Dm/Android.bp b/test/674-HelloWorld-Dm/Android.bp
index 2ff2a0b..57d6fdf 100644
--- a/test/674-HelloWorld-Dm/Android.bp
+++ b/test/674-HelloWorld-Dm/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-674-HelloWorld-Dm-expected"],
+    data: [":art-run-test-674-HelloWorld-Dm-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-674-HelloWorld-Dm-expected",
-    out: ["art-run-test-674-HelloWorld-Dm-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-674-HelloWorld-Dm-expected-stdout",
+    out: ["art-run-test-674-HelloWorld-Dm-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/674-HelloWorld-Dm/expected-stdout.txt

diff --git a/test/674-HelloWorld-Dm/expected.txt b/test/674-HelloWorld-Dm/expected-stdout.txt
similarity index 100%
rename from test/674-HelloWorld-Dm/expected.txt
rename to test/674-HelloWorld-Dm/expected-stdout.txt

test/674-hiddenapi/expected-stdout.txt

diff --git a/test/674-hiddenapi/expected.txt b/test/674-hiddenapi/expected-stdout.txt
similarity index 100%
rename from test/674-hiddenapi/expected.txt
rename to test/674-hiddenapi/expected-stdout.txt

test/674-hotness-compiled/Android.bp

diff --git a/test/674-hotness-compiled/Android.bp b/test/674-hotness-compiled/Android.bp
index ca4f372..430ade1 100644
--- a/test/674-hotness-compiled/Android.bp
+++ b/test/674-hotness-compiled/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-674-hotness-compiled-expected"],
+    data: [":art-run-test-674-hotness-compiled-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-674-hotness-compiled-expected",
-    out: ["art-run-test-674-hotness-compiled-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-674-hotness-compiled-expected-stdout",
+    out: ["art-run-test-674-hotness-compiled-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/674-hotness-compiled/expected-stdout.txt

diff --git a/test/674-hotness-compiled/expected.txt b/test/674-hotness-compiled/expected-stdout.txt
similarity index 100%
rename from test/674-hotness-compiled/expected.txt
rename to test/674-hotness-compiled/expected-stdout.txt

test/674-vdex-uncompress/expected-stdout.txt

diff --git a/test/674-vdex-uncompress/expected.txt b/test/674-vdex-uncompress/expected-stdout.txt
similarity index 100%
rename from test/674-vdex-uncompress/expected.txt
rename to test/674-vdex-uncompress/expected-stdout.txt

test/675-checker-unverified-method/expected-stdout.txt

diff --git a/test/675-checker-unverified-method/expected.txt b/test/675-checker-unverified-method/expected-stdout.txt
similarity index 100%
rename from test/675-checker-unverified-method/expected.txt
rename to test/675-checker-unverified-method/expected-stdout.txt

test/676-proxy-jit-at-first-use/Android.bp

diff --git a/test/676-proxy-jit-at-first-use/Android.bp b/test/676-proxy-jit-at-first-use/Android.bp
index 7ecdd2a..6298969 100644
--- a/test/676-proxy-jit-at-first-use/Android.bp
+++ b/test/676-proxy-jit-at-first-use/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-676-proxy-jit-at-first-use-expected"],
+    data: [":art-run-test-676-proxy-jit-at-first-use-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-676-proxy-jit-at-first-use-expected",
-    out: ["art-run-test-676-proxy-jit-at-first-use-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-676-proxy-jit-at-first-use-expected-stdout",
+    out: ["art-run-test-676-proxy-jit-at-first-use-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/676-proxy-jit-at-first-use/expected-stdout.txt

diff --git a/test/676-proxy-jit-at-first-use/expected.txt b/test/676-proxy-jit-at-first-use/expected-stdout.txt
similarity index 100%
rename from test/676-proxy-jit-at-first-use/expected.txt
rename to test/676-proxy-jit-at-first-use/expected-stdout.txt

test/676-resolve-field-type/expected-stdout.txt

diff --git a/test/676-resolve-field-type/expected.txt b/test/676-resolve-field-type/expected-stdout.txt
similarity index 100%
rename from test/676-resolve-field-type/expected.txt
rename to test/676-resolve-field-type/expected-stdout.txt

test/677-fsi/expected-stdout.txt

diff --git a/test/677-fsi/expected.txt b/test/677-fsi/expected-stdout.txt
similarity index 100%
rename from test/677-fsi/expected.txt
rename to test/677-fsi/expected-stdout.txt

test/677-fsi2/Android.bp

diff --git a/test/677-fsi2/Android.bp b/test/677-fsi2/Android.bp
index 59c899a..f49b233 100644
--- a/test/677-fsi2/Android.bp
+++ b/test/677-fsi2/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-677-fsi2-expected"],
+    data: [":art-run-test-677-fsi2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-677-fsi2-expected",
-    out: ["art-run-test-677-fsi2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-677-fsi2-expected-stdout",
+    out: ["art-run-test-677-fsi2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/677-fsi2/expected-stdout.txt

diff --git a/test/677-fsi2/expected.txt b/test/677-fsi2/expected-stdout.txt
similarity index 100%
rename from test/677-fsi2/expected.txt
rename to test/677-fsi2/expected-stdout.txt

test/678-quickening/expected-stdout.txt

diff --git a/test/678-quickening/expected.txt b/test/678-quickening/expected-stdout.txt
similarity index 100%
rename from test/678-quickening/expected.txt
rename to test/678-quickening/expected-stdout.txt

test/679-locks/Android.bp

diff --git a/test/679-locks/Android.bp b/test/679-locks/Android.bp
index 73d7b8e..6fa4825 100644
--- a/test/679-locks/Android.bp
+++ b/test/679-locks/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-679-locks-expected"],
+    data: [":art-run-test-679-locks-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-679-locks-expected",
-    out: ["art-run-test-679-locks-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-679-locks-expected-stdout",
+    out: ["art-run-test-679-locks-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/679-locks/expected-stdout.txt

diff --git a/test/679-locks/expected.txt b/test/679-locks/expected-stdout.txt
similarity index 100%
rename from test/679-locks/expected.txt
rename to test/679-locks/expected-stdout.txt

test/680-checker-deopt-dex-pc-0/Android.bp

diff --git a/test/680-checker-deopt-dex-pc-0/Android.bp b/test/680-checker-deopt-dex-pc-0/Android.bp
index 28c7a98..eb06043 100644
--- a/test/680-checker-deopt-dex-pc-0/Android.bp
+++ b/test/680-checker-deopt-dex-pc-0/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-680-checker-deopt-dex-pc-0-expected"],
+    data: [":art-run-test-680-checker-deopt-dex-pc-0-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-680-checker-deopt-dex-pc-0-expected",
-    out: ["art-run-test-680-checker-deopt-dex-pc-0-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-680-checker-deopt-dex-pc-0-expected-stdout",
+    out: ["art-run-test-680-checker-deopt-dex-pc-0-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/680-checker-deopt-dex-pc-0/expected-stdout.txt

diff --git a/test/680-checker-deopt-dex-pc-0/expected.txt b/test/680-checker-deopt-dex-pc-0/expected-stdout.txt
similarity index 100%
rename from test/680-checker-deopt-dex-pc-0/expected.txt
rename to test/680-checker-deopt-dex-pc-0/expected-stdout.txt

test/680-sink-regression/Android.bp

diff --git a/test/680-sink-regression/Android.bp b/test/680-sink-regression/Android.bp
index 0b2634d..5d14b64 100644
--- a/test/680-sink-regression/Android.bp
+++ b/test/680-sink-regression/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-680-sink-regression-expected"],
+    data: [":art-run-test-680-sink-regression-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-680-sink-regression-expected",
-    out: ["art-run-test-680-sink-regression-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-680-sink-regression-expected-stdout",
+    out: ["art-run-test-680-sink-regression-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/680-sink-regression/expected-stdout.txt

diff --git a/test/680-sink-regression/expected.txt b/test/680-sink-regression/expected-stdout.txt
similarity index 100%
rename from test/680-sink-regression/expected.txt
rename to test/680-sink-regression/expected-stdout.txt

test/682-double-catch-phi/expected-stdout.txt

diff --git a/test/682-double-catch-phi/expected.txt b/test/682-double-catch-phi/expected-stdout.txt
similarity index 100%
rename from test/682-double-catch-phi/expected.txt
rename to test/682-double-catch-phi/expected-stdout.txt

test/683-clinit-inline-static-invoke/expected-stdout.txt

diff --git a/test/683-clinit-inline-static-invoke/expected.txt b/test/683-clinit-inline-static-invoke/expected-stdout.txt
similarity index 100%
rename from test/683-clinit-inline-static-invoke/expected.txt
rename to test/683-clinit-inline-static-invoke/expected-stdout.txt

test/684-checker-simd-dotprod/Android.bp

diff --git a/test/684-checker-simd-dotprod/Android.bp b/test/684-checker-simd-dotprod/Android.bp
index 886c08c..23c98f8 100644
--- a/test/684-checker-simd-dotprod/Android.bp
+++ b/test/684-checker-simd-dotprod/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-684-checker-simd-dotprod-expected"],
+    data: [":art-run-test-684-checker-simd-dotprod-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-684-checker-simd-dotprod-expected",
-    out: ["art-run-test-684-checker-simd-dotprod-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-684-checker-simd-dotprod-expected-stdout",
+    out: ["art-run-test-684-checker-simd-dotprod-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/684-checker-simd-dotprod/expected-stdout.txt

diff --git a/test/684-checker-simd-dotprod/expected.txt b/test/684-checker-simd-dotprod/expected-stdout.txt
similarity index 100%
rename from test/684-checker-simd-dotprod/expected.txt
rename to test/684-checker-simd-dotprod/expected-stdout.txt

test/684-select-condition/Android.bp

diff --git a/test/684-select-condition/Android.bp b/test/684-select-condition/Android.bp
index bb0e490..acc48db 100644
--- a/test/684-select-condition/Android.bp
+++ b/test/684-select-condition/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-684-select-condition-expected"],
+    data: [":art-run-test-684-select-condition-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-684-select-condition-expected",
-    out: ["art-run-test-684-select-condition-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-684-select-condition-expected-stdout",
+    out: ["art-run-test-684-select-condition-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/684-select-condition/expected-stdout.txt

diff --git a/test/684-select-condition/expected.txt b/test/684-select-condition/expected-stdout.txt
similarity index 100%
rename from test/684-select-condition/expected.txt
rename to test/684-select-condition/expected-stdout.txt

test/685-deoptimizeable/Android.bp

diff --git a/test/685-deoptimizeable/Android.bp b/test/685-deoptimizeable/Android.bp
index 04a8305..83059c3 100644
--- a/test/685-deoptimizeable/Android.bp
+++ b/test/685-deoptimizeable/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-685-deoptimizeable-expected"],
+    data: [":art-run-test-685-deoptimizeable-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-685-deoptimizeable-expected",
-    out: ["art-run-test-685-deoptimizeable-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-685-deoptimizeable-expected-stdout",
+    out: ["art-run-test-685-deoptimizeable-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/685-deoptimizeable/expected-stdout.txt

diff --git a/test/685-deoptimizeable/expected.txt b/test/685-deoptimizeable/expected-stdout.txt
similarity index 100%
rename from test/685-deoptimizeable/expected.txt
rename to test/685-deoptimizeable/expected-stdout.txt

test/685-shifts/expected-stdout.txt

diff --git a/test/685-shifts/expected.txt b/test/685-shifts/expected-stdout.txt
similarity index 100%
rename from test/685-shifts/expected.txt
rename to test/685-shifts/expected-stdout.txt

test/686-get-this/expected-stdout.txt

diff --git a/test/686-get-this/expected.txt b/test/686-get-this/expected-stdout.txt
similarity index 100%
rename from test/686-get-this/expected.txt
rename to test/686-get-this/expected-stdout.txt

test/687-deopt/Android.bp

diff --git a/test/687-deopt/Android.bp b/test/687-deopt/Android.bp
index e75c905..e9c75af 100644
--- a/test/687-deopt/Android.bp
+++ b/test/687-deopt/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-687-deopt-expected"],
+    data: [":art-run-test-687-deopt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-687-deopt-expected",
-    out: ["art-run-test-687-deopt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-687-deopt-expected-stdout",
+    out: ["art-run-test-687-deopt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/687-deopt/expected-stdout.txt

diff --git a/test/687-deopt/expected.txt b/test/687-deopt/expected-stdout.txt
similarity index 100%
rename from test/687-deopt/expected.txt
rename to test/687-deopt/expected-stdout.txt

test/688-shared-library/expected-stdout.txt

diff --git a/test/688-shared-library/expected.txt b/test/688-shared-library/expected-stdout.txt
similarity index 100%
rename from test/688-shared-library/expected.txt
rename to test/688-shared-library/expected-stdout.txt

test/689-multi-catch/Android.bp

diff --git a/test/689-multi-catch/Android.bp b/test/689-multi-catch/Android.bp
index c383b95..be3e8c0 100644
--- a/test/689-multi-catch/Android.bp
+++ b/test/689-multi-catch/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-689-multi-catch-expected"],
+    data: [":art-run-test-689-multi-catch-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-689-multi-catch-expected",
-    out: ["art-run-test-689-multi-catch-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-689-multi-catch-expected-stdout",
+    out: ["art-run-test-689-multi-catch-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/689-multi-catch/expected-stdout.txt

diff --git a/test/689-multi-catch/expected.txt b/test/689-multi-catch/expected-stdout.txt
similarity index 100%
rename from test/689-multi-catch/expected.txt
rename to test/689-multi-catch/expected-stdout.txt

test/689-zygote-jit-deopt/Android.bp

diff --git a/test/689-zygote-jit-deopt/Android.bp b/test/689-zygote-jit-deopt/Android.bp
index f76621e..a1a36eb 100644
--- a/test/689-zygote-jit-deopt/Android.bp
+++ b/test/689-zygote-jit-deopt/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-689-zygote-jit-deopt-expected"],
+    data: [":art-run-test-689-zygote-jit-deopt-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-689-zygote-jit-deopt-expected",
-    out: ["art-run-test-689-zygote-jit-deopt-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-689-zygote-jit-deopt-expected-stdout",
+    out: ["art-run-test-689-zygote-jit-deopt-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/689-zygote-jit-deopt/expected-stdout.txt

diff --git a/test/689-zygote-jit-deopt/expected.txt b/test/689-zygote-jit-deopt/expected-stdout.txt
similarity index 100%
rename from test/689-zygote-jit-deopt/expected.txt
rename to test/689-zygote-jit-deopt/expected-stdout.txt

test/690-hiddenapi-same-name-methods/expected-stdout.txt

diff --git a/test/690-hiddenapi-same-name-methods/expected.txt b/test/690-hiddenapi-same-name-methods/expected-stdout.txt
similarity index 100%
rename from test/690-hiddenapi-same-name-methods/expected.txt
rename to test/690-hiddenapi-same-name-methods/expected-stdout.txt

test/691-hiddenapi-proxy/expected-stdout.txt

diff --git a/test/691-hiddenapi-proxy/expected.txt b/test/691-hiddenapi-proxy/expected-stdout.txt
similarity index 100%
rename from test/691-hiddenapi-proxy/expected.txt
rename to test/691-hiddenapi-proxy/expected-stdout.txt

test/692-vdex-inmem-loader/expected-stdout.txt

diff --git a/test/692-vdex-inmem-loader/expected.txt b/test/692-vdex-inmem-loader/expected-stdout.txt
similarity index 100%
rename from test/692-vdex-inmem-loader/expected.txt
rename to test/692-vdex-inmem-loader/expected-stdout.txt

test/693-vdex-inmem-loader-evict/Android.bp

diff --git a/test/693-vdex-inmem-loader-evict/Android.bp b/test/693-vdex-inmem-loader-evict/Android.bp
index 97d8776..00565d2 100644
--- a/test/693-vdex-inmem-loader-evict/Android.bp
+++ b/test/693-vdex-inmem-loader-evict/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-693-vdex-inmem-loader-evict-expected"],
+    data: [":art-run-test-693-vdex-inmem-loader-evict-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-693-vdex-inmem-loader-evict-expected",
-    out: ["art-run-test-693-vdex-inmem-loader-evict-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-693-vdex-inmem-loader-evict-expected-stdout",
+    out: ["art-run-test-693-vdex-inmem-loader-evict-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/693-vdex-inmem-loader-evict/expected-stdout.txt

diff --git a/test/693-vdex-inmem-loader-evict/expected.txt b/test/693-vdex-inmem-loader-evict/expected-stdout.txt
similarity index 100%
rename from test/693-vdex-inmem-loader-evict/expected.txt
rename to test/693-vdex-inmem-loader-evict/expected-stdout.txt

test/694-clinit-jit/Android.bp

diff --git a/test/694-clinit-jit/Android.bp b/test/694-clinit-jit/Android.bp
index d118ffe..287e96c 100644
--- a/test/694-clinit-jit/Android.bp
+++ b/test/694-clinit-jit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-694-clinit-jit-expected"],
+    data: [":art-run-test-694-clinit-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-694-clinit-jit-expected",
-    out: ["art-run-test-694-clinit-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-694-clinit-jit-expected-stdout",
+    out: ["art-run-test-694-clinit-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/694-clinit-jit/expected-stdout.txt

diff --git a/test/694-clinit-jit/expected.txt b/test/694-clinit-jit/expected-stdout.txt
similarity index 100%
rename from test/694-clinit-jit/expected.txt
rename to test/694-clinit-jit/expected-stdout.txt

test/695-simplify-throws/Android.bp

diff --git a/test/695-simplify-throws/Android.bp b/test/695-simplify-throws/Android.bp
index c97bbc2..f0f4626 100644
--- a/test/695-simplify-throws/Android.bp
+++ b/test/695-simplify-throws/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-695-simplify-throws-expected"],
+    data: [":art-run-test-695-simplify-throws-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-695-simplify-throws-expected",
-    out: ["art-run-test-695-simplify-throws-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-695-simplify-throws-expected-stdout",
+    out: ["art-run-test-695-simplify-throws-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/695-simplify-throws/expected-stdout.txt

diff --git a/test/695-simplify-throws/expected.txt b/test/695-simplify-throws/expected-stdout.txt
similarity index 100%
rename from test/695-simplify-throws/expected.txt
rename to test/695-simplify-throws/expected-stdout.txt

test/696-loop/Android.bp

diff --git a/test/696-loop/Android.bp b/test/696-loop/Android.bp
index cdaa17b..062d825 100644
--- a/test/696-loop/Android.bp
+++ b/test/696-loop/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-696-loop-expected"],
+    data: [":art-run-test-696-loop-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-696-loop-expected",
-    out: ["art-run-test-696-loop-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-696-loop-expected-stdout",
+    out: ["art-run-test-696-loop-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/696-loop/expected-stdout.txt

diff --git a/test/696-loop/expected.txt b/test/696-loop/expected-stdout.txt
similarity index 100%
rename from test/696-loop/expected.txt
rename to test/696-loop/expected-stdout.txt

test/697-checker-string-append/Android.bp

diff --git a/test/697-checker-string-append/Android.bp b/test/697-checker-string-append/Android.bp
index 78210fd..2909088 100644
--- a/test/697-checker-string-append/Android.bp
+++ b/test/697-checker-string-append/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-697-checker-string-append-expected"],
+    data: [":art-run-test-697-checker-string-append-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-697-checker-string-append-expected",
-    out: ["art-run-test-697-checker-string-append-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-697-checker-string-append-expected-stdout",
+    out: ["art-run-test-697-checker-string-append-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/697-checker-string-append/expected-stdout.txt

diff --git a/test/697-checker-string-append/expected.txt b/test/697-checker-string-append/expected-stdout.txt
similarity index 100%
rename from test/697-checker-string-append/expected.txt
rename to test/697-checker-string-append/expected-stdout.txt

test/698-selects/Android.bp

diff --git a/test/698-selects/Android.bp b/test/698-selects/Android.bp
index f9b839c..03ce2b7 100644
--- a/test/698-selects/Android.bp
+++ b/test/698-selects/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-698-selects-expected"],
+    data: [":art-run-test-698-selects-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-698-selects-expected",
-    out: ["art-run-test-698-selects-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-698-selects-expected-stdout",
+    out: ["art-run-test-698-selects-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/698-selects/expected-stdout.txt

diff --git a/test/698-selects/expected.txt b/test/698-selects/expected-stdout.txt
similarity index 100%
rename from test/698-selects/expected.txt
rename to test/698-selects/expected-stdout.txt

test/699-checker-string-append2/expected-stdout.txt

diff --git a/test/699-checker-string-append2/expected.txt b/test/699-checker-string-append2/expected-stdout.txt
similarity index 100%
rename from test/699-checker-string-append2/expected.txt
rename to test/699-checker-string-append2/expected-stdout.txt

test/700-LoadArgRegs/Android.bp

diff --git a/test/700-LoadArgRegs/Android.bp b/test/700-LoadArgRegs/Android.bp
index 5b16670..133161e 100644
--- a/test/700-LoadArgRegs/Android.bp
+++ b/test/700-LoadArgRegs/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-700-LoadArgRegs-expected"],
+    data: [":art-run-test-700-LoadArgRegs-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-700-LoadArgRegs-expected",
-    out: ["art-run-test-700-LoadArgRegs-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-700-LoadArgRegs-expected-stdout",
+    out: ["art-run-test-700-LoadArgRegs-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/700-LoadArgRegs/expected-stdout.txt

diff --git a/test/700-LoadArgRegs/expected.txt b/test/700-LoadArgRegs/expected-stdout.txt
similarity index 100%
rename from test/700-LoadArgRegs/expected.txt
rename to test/700-LoadArgRegs/expected-stdout.txt

test/701-easy-div-rem/expected-stdout.txt

diff --git a/test/701-easy-div-rem/expected.txt b/test/701-easy-div-rem/expected-stdout.txt
similarity index 100%
rename from test/701-easy-div-rem/expected.txt
rename to test/701-easy-div-rem/expected-stdout.txt

test/702-LargeBranchOffset/expected-stdout.txt

diff --git a/test/702-LargeBranchOffset/expected.txt b/test/702-LargeBranchOffset/expected-stdout.txt
similarity index 100%
rename from test/702-LargeBranchOffset/expected.txt
rename to test/702-LargeBranchOffset/expected-stdout.txt

test/703-floating-point-div/Android.bp

diff --git a/test/703-floating-point-div/Android.bp b/test/703-floating-point-div/Android.bp
index c78061c..d4e9463 100644
--- a/test/703-floating-point-div/Android.bp
+++ b/test/703-floating-point-div/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-703-floating-point-div-expected"],
+    data: [":art-run-test-703-floating-point-div-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-703-floating-point-div-expected",
-    out: ["art-run-test-703-floating-point-div-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-703-floating-point-div-expected-stdout",
+    out: ["art-run-test-703-floating-point-div-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/703-floating-point-div/expected-stdout.txt

diff --git a/test/703-floating-point-div/expected.txt b/test/703-floating-point-div/expected-stdout.txt
similarity index 100%
rename from test/703-floating-point-div/expected.txt
rename to test/703-floating-point-div/expected-stdout.txt

test/704-multiply-accumulate/Android.bp

diff --git a/test/704-multiply-accumulate/Android.bp b/test/704-multiply-accumulate/Android.bp
index 1906635..e8d271a 100644
--- a/test/704-multiply-accumulate/Android.bp
+++ b/test/704-multiply-accumulate/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-704-multiply-accumulate-expected"],
+    data: [":art-run-test-704-multiply-accumulate-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-704-multiply-accumulate-expected",
-    out: ["art-run-test-704-multiply-accumulate-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-704-multiply-accumulate-expected-stdout",
+    out: ["art-run-test-704-multiply-accumulate-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/704-multiply-accumulate/expected-stdout.txt

diff --git a/test/704-multiply-accumulate/expected.txt b/test/704-multiply-accumulate/expected-stdout.txt
similarity index 100%
rename from test/704-multiply-accumulate/expected.txt
rename to test/704-multiply-accumulate/expected-stdout.txt

test/705-register-conflict/Android.bp

diff --git a/test/705-register-conflict/Android.bp b/test/705-register-conflict/Android.bp
index e4a770d..bf81bac 100644
--- a/test/705-register-conflict/Android.bp
+++ b/test/705-register-conflict/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-705-register-conflict-expected"],
+    data: [":art-run-test-705-register-conflict-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-705-register-conflict-expected",
-    out: ["art-run-test-705-register-conflict-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-705-register-conflict-expected-stdout",
+    out: ["art-run-test-705-register-conflict-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/705-register-conflict/expected-stdout.txt

diff --git a/test/705-register-conflict/expected.txt b/test/705-register-conflict/expected-stdout.txt
similarity index 100%
rename from test/705-register-conflict/expected.txt
rename to test/705-register-conflict/expected-stdout.txt

test/706-checker-scheduler/expected-stdout.txt

diff --git a/test/706-checker-scheduler/expected.txt b/test/706-checker-scheduler/expected-stdout.txt
similarity index 100%
rename from test/706-checker-scheduler/expected.txt
rename to test/706-checker-scheduler/expected-stdout.txt

test/707-checker-invalid-profile/Android.bp

diff --git a/test/707-checker-invalid-profile/Android.bp b/test/707-checker-invalid-profile/Android.bp
index a7cac49..115e706 100644
--- a/test/707-checker-invalid-profile/Android.bp
+++ b/test/707-checker-invalid-profile/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-707-checker-invalid-profile-expected"],
+    data: [":art-run-test-707-checker-invalid-profile-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-707-checker-invalid-profile-expected",
-    out: ["art-run-test-707-checker-invalid-profile-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-707-checker-invalid-profile-expected-stdout",
+    out: ["art-run-test-707-checker-invalid-profile-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/707-checker-invalid-profile/expected-stdout.txt

diff --git a/test/707-checker-invalid-profile/expected.txt b/test/707-checker-invalid-profile/expected-stdout.txt
similarity index 100%
rename from test/707-checker-invalid-profile/expected.txt
rename to test/707-checker-invalid-profile/expected-stdout.txt

test/708-jit-cache-churn/Android.bp

diff --git a/test/708-jit-cache-churn/Android.bp b/test/708-jit-cache-churn/Android.bp
index 23b37f6..61099c1 100644
--- a/test/708-jit-cache-churn/Android.bp
+++ b/test/708-jit-cache-churn/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-708-jit-cache-churn-expected"],
+    data: [":art-run-test-708-jit-cache-churn-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-708-jit-cache-churn-expected",
-    out: ["art-run-test-708-jit-cache-churn-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-708-jit-cache-churn-expected-stdout",
+    out: ["art-run-test-708-jit-cache-churn-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/708-jit-cache-churn/expected-stdout.txt

diff --git a/test/708-jit-cache-churn/expected.txt b/test/708-jit-cache-churn/expected-stdout.txt
similarity index 100%
rename from test/708-jit-cache-churn/expected.txt
rename to test/708-jit-cache-churn/expected-stdout.txt

test/710-varhandle-creation/expected-stdout.txt

diff --git a/test/710-varhandle-creation/expected.txt b/test/710-varhandle-creation/expected-stdout.txt
similarity index 100%
rename from test/710-varhandle-creation/expected.txt
rename to test/710-varhandle-creation/expected-stdout.txt

test/711-checker-type-conversion/Android.bp

diff --git a/test/711-checker-type-conversion/Android.bp b/test/711-checker-type-conversion/Android.bp
index 67a03e8..cab3f79 100644
--- a/test/711-checker-type-conversion/Android.bp
+++ b/test/711-checker-type-conversion/Android.bp
@@ -8,7 +8,7 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-711-checker-type-conversion-expected"],
+    data: [":art-run-test-711-checker-type-conversion-expected-stdout"],
     // Include the Java source files in the test's artifacts, to make Checker assertions
     // available to the TradeFed test runner.
     include_srcs: true,
@@ -16,8 +16,8 @@
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-711-checker-type-conversion-expected",
-    out: ["art-run-test-711-checker-type-conversion-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-711-checker-type-conversion-expected-stdout",
+    out: ["art-run-test-711-checker-type-conversion-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/711-checker-type-conversion/expected-stdout.txt

diff --git a/test/711-checker-type-conversion/expected.txt b/test/711-checker-type-conversion/expected-stdout.txt
similarity index 100%
rename from test/711-checker-type-conversion/expected.txt
rename to test/711-checker-type-conversion/expected-stdout.txt

test/712-varhandle-invocations/expected-stdout.txt

diff --git a/test/712-varhandle-invocations/expected.txt b/test/712-varhandle-invocations/expected-stdout.txt
similarity index 100%
rename from test/712-varhandle-invocations/expected.txt
rename to test/712-varhandle-invocations/expected-stdout.txt

test/713-varhandle-invokers/expected-stdout.txt

diff --git a/test/713-varhandle-invokers/expected.txt b/test/713-varhandle-invokers/expected-stdout.txt
similarity index 100%
rename from test/713-varhandle-invokers/expected.txt
rename to test/713-varhandle-invokers/expected-stdout.txt

test/714-invoke-custom-lambda-metafactory/expected-stdout.txt

diff --git a/test/714-invoke-custom-lambda-metafactory/expected.txt b/test/714-invoke-custom-lambda-metafactory/expected-stdout.txt
similarity index 100%
rename from test/714-invoke-custom-lambda-metafactory/expected.txt
rename to test/714-invoke-custom-lambda-metafactory/expected-stdout.txt

test/715-clinit-implicit-parameter-annotations/expected-stdout.txt

diff --git a/test/715-clinit-implicit-parameter-annotations/expected.txt b/test/715-clinit-implicit-parameter-annotations/expected-stdout.txt
similarity index 100%
rename from test/715-clinit-implicit-parameter-annotations/expected.txt
rename to test/715-clinit-implicit-parameter-annotations/expected-stdout.txt

test/716-jli-jit-samples/expected-stdout.txt

diff --git a/test/716-jli-jit-samples/expected.txt b/test/716-jli-jit-samples/expected-stdout.txt
similarity index 100%
rename from test/716-jli-jit-samples/expected.txt
rename to test/716-jli-jit-samples/expected-stdout.txt

test/717-integer-value-of/Android.bp

diff --git a/test/717-integer-value-of/Android.bp b/test/717-integer-value-of/Android.bp
index 655ede4..fae8899 100644
--- a/test/717-integer-value-of/Android.bp
+++ b/test/717-integer-value-of/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-717-integer-value-of-expected"],
+    data: [":art-run-test-717-integer-value-of-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-717-integer-value-of-expected",
-    out: ["art-run-test-717-integer-value-of-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-717-integer-value-of-expected-stdout",
+    out: ["art-run-test-717-integer-value-of-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/717-integer-value-of/expected-stdout.txt

diff --git a/test/717-integer-value-of/expected.txt b/test/717-integer-value-of/expected-stdout.txt
similarity index 100%
rename from test/717-integer-value-of/expected.txt
rename to test/717-integer-value-of/expected-stdout.txt

test/718-zipfile-finalizer/Android.bp

diff --git a/test/718-zipfile-finalizer/Android.bp b/test/718-zipfile-finalizer/Android.bp
index 64c7d36..57921b9 100644
--- a/test/718-zipfile-finalizer/Android.bp
+++ b/test/718-zipfile-finalizer/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-718-zipfile-finalizer-expected"],
+    data: [":art-run-test-718-zipfile-finalizer-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-718-zipfile-finalizer-expected",
-    out: ["art-run-test-718-zipfile-finalizer-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-718-zipfile-finalizer-expected-stdout",
+    out: ["art-run-test-718-zipfile-finalizer-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/718-zipfile-finalizer/expected-stdout.txt

diff --git a/test/718-zipfile-finalizer/expected.txt b/test/718-zipfile-finalizer/expected-stdout.txt
similarity index 100%
rename from test/718-zipfile-finalizer/expected.txt
rename to test/718-zipfile-finalizer/expected-stdout.txt

test/719-dm-verify-redefinition/expected-stdout.txt

diff --git a/test/719-dm-verify-redefinition/expected.txt b/test/719-dm-verify-redefinition/expected-stdout.txt
similarity index 100%
rename from test/719-dm-verify-redefinition/expected.txt
rename to test/719-dm-verify-redefinition/expected-stdout.txt

test/720-thread-priority/Android.bp

diff --git a/test/720-thread-priority/Android.bp b/test/720-thread-priority/Android.bp
index bfd1ae4..ae632d3 100644
--- a/test/720-thread-priority/Android.bp
+++ b/test/720-thread-priority/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-720-thread-priority-expected"],
+    data: [":art-run-test-720-thread-priority-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-720-thread-priority-expected",
-    out: ["art-run-test-720-thread-priority-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-720-thread-priority-expected-stdout",
+    out: ["art-run-test-720-thread-priority-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/720-thread-priority/expected-stdout.txt

diff --git a/test/720-thread-priority/expected.txt b/test/720-thread-priority/expected-stdout.txt
similarity index 100%
rename from test/720-thread-priority/expected.txt
rename to test/720-thread-priority/expected-stdout.txt

test/721-osr/Android.bp

diff --git a/test/721-osr/Android.bp b/test/721-osr/Android.bp
index 0b2519d..d7c8d42 100644
--- a/test/721-osr/Android.bp
+++ b/test/721-osr/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-721-osr-expected"],
+    data: [":art-run-test-721-osr-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-721-osr-expected",
-    out: ["art-run-test-721-osr-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-721-osr-expected-stdout",
+    out: ["art-run-test-721-osr-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/721-osr/expected-stdout.txt

diff --git a/test/721-osr/expected.txt b/test/721-osr/expected-stdout.txt
similarity index 100%
rename from test/721-osr/expected.txt
rename to test/721-osr/expected-stdout.txt

test/723-string-init-range/expected-stdout.txt

diff --git a/test/723-string-init-range/expected.txt b/test/723-string-init-range/expected-stdout.txt
similarity index 100%
rename from test/723-string-init-range/expected.txt
rename to test/723-string-init-range/expected-stdout.txt

test/724-invoke-super-npe/expected-stdout.txt

diff --git a/test/724-invoke-super-npe/expected.txt b/test/724-invoke-super-npe/expected-stdout.txt
similarity index 100%
rename from test/724-invoke-super-npe/expected.txt
rename to test/724-invoke-super-npe/expected-stdout.txt

test/725-imt-conflict-object/expected-stdout.txt

diff --git a/test/725-imt-conflict-object/expected.txt b/test/725-imt-conflict-object/expected-stdout.txt
similarity index 100%
rename from test/725-imt-conflict-object/expected.txt
rename to test/725-imt-conflict-object/expected-stdout.txt

test/726-array-store/Android.bp

diff --git a/test/726-array-store/Android.bp b/test/726-array-store/Android.bp
index 5ffe504..fc688c6 100644
--- a/test/726-array-store/Android.bp
+++ b/test/726-array-store/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-726-array-store-expected"],
+    data: [":art-run-test-726-array-store-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-726-array-store-expected",
-    out: ["art-run-test-726-array-store-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-726-array-store-expected-stdout",
+    out: ["art-run-test-726-array-store-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/726-array-store/expected-stdout.txt

diff --git a/test/726-array-store/expected.txt b/test/726-array-store/expected-stdout.txt
similarity index 100%
rename from test/726-array-store/expected.txt
rename to test/726-array-store/expected-stdout.txt

test/727-checker-unresolved-class/expected-stdout.txt

diff --git a/test/727-checker-unresolved-class/expected.txt b/test/727-checker-unresolved-class/expected-stdout.txt
similarity index 100%
rename from test/727-checker-unresolved-class/expected.txt
rename to test/727-checker-unresolved-class/expected-stdout.txt

test/800-smali/expected-stdout.txt

diff --git a/test/800-smali/expected.txt b/test/800-smali/expected-stdout.txt
similarity index 100%
rename from test/800-smali/expected.txt
rename to test/800-smali/expected-stdout.txt

test/801-VoidCheckCast/expected-stdout.txt

diff --git a/test/801-VoidCheckCast/expected.txt b/test/801-VoidCheckCast/expected-stdout.txt
similarity index 100%
rename from test/801-VoidCheckCast/expected.txt
rename to test/801-VoidCheckCast/expected-stdout.txt

test/802-deoptimization/expected-stdout.txt

diff --git a/test/802-deoptimization/expected.txt b/test/802-deoptimization/expected-stdout.txt
similarity index 100%
rename from test/802-deoptimization/expected.txt
rename to test/802-deoptimization/expected-stdout.txt

test/803-no-super/expected-stdout.txt

diff --git a/test/803-no-super/expected.txt b/test/803-no-super/expected-stdout.txt
similarity index 100%
rename from test/803-no-super/expected.txt
rename to test/803-no-super/expected-stdout.txt

test/804-class-extends-itself/expected-stdout.txt

diff --git a/test/804-class-extends-itself/expected.txt b/test/804-class-extends-itself/expected-stdout.txt
similarity index 100%
rename from test/804-class-extends-itself/expected.txt
rename to test/804-class-extends-itself/expected-stdout.txt

test/805-TooDeepClassInstanceOf/Android.bp

diff --git a/test/805-TooDeepClassInstanceOf/Android.bp b/test/805-TooDeepClassInstanceOf/Android.bp
index 883248f..f90bc11 100644
--- a/test/805-TooDeepClassInstanceOf/Android.bp
+++ b/test/805-TooDeepClassInstanceOf/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-805-TooDeepClassInstanceOf-expected"],
+    data: [":art-run-test-805-TooDeepClassInstanceOf-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-805-TooDeepClassInstanceOf-expected",
-    out: ["art-run-test-805-TooDeepClassInstanceOf-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-805-TooDeepClassInstanceOf-expected-stdout",
+    out: ["art-run-test-805-TooDeepClassInstanceOf-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/805-TooDeepClassInstanceOf/expected-stdout.txt

diff --git a/test/805-TooDeepClassInstanceOf/expected.txt b/test/805-TooDeepClassInstanceOf/expected-stdout.txt
similarity index 100%
rename from test/805-TooDeepClassInstanceOf/expected.txt
rename to test/805-TooDeepClassInstanceOf/expected-stdout.txt

test/806-TooWideClassInstanceOf/Android.bp

diff --git a/test/806-TooWideClassInstanceOf/Android.bp b/test/806-TooWideClassInstanceOf/Android.bp
index 358eeb5..f400d2f 100644
--- a/test/806-TooWideClassInstanceOf/Android.bp
+++ b/test/806-TooWideClassInstanceOf/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-806-TooWideClassInstanceOf-expected"],
+    data: [":art-run-test-806-TooWideClassInstanceOf-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-806-TooWideClassInstanceOf-expected",
-    out: ["art-run-test-806-TooWideClassInstanceOf-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-806-TooWideClassInstanceOf-expected-stdout",
+    out: ["art-run-test-806-TooWideClassInstanceOf-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/806-TooWideClassInstanceOf/expected-stdout.txt

diff --git a/test/806-TooWideClassInstanceOf/expected.txt b/test/806-TooWideClassInstanceOf/expected-stdout.txt
similarity index 100%
rename from test/806-TooWideClassInstanceOf/expected.txt
rename to test/806-TooWideClassInstanceOf/expected-stdout.txt

test/807-method-handle-and-mr/expected-stdout.txt

diff --git a/test/807-method-handle-and-mr/expected.txt b/test/807-method-handle-and-mr/expected-stdout.txt
similarity index 100%
rename from test/807-method-handle-and-mr/expected.txt
rename to test/807-method-handle-and-mr/expected-stdout.txt

test/808-checker-invoke-super/expected-stdout.txt

diff --git a/test/808-checker-invoke-super/expected.txt b/test/808-checker-invoke-super/expected-stdout.txt
similarity index 100%
rename from test/808-checker-invoke-super/expected.txt
rename to test/808-checker-invoke-super/expected-stdout.txt

test/809-checker-invoke-super-bss/expected-stdout.txt

diff --git a/test/809-checker-invoke-super-bss/expected.txt b/test/809-checker-invoke-super-bss/expected-stdout.txt
similarity index 100%
rename from test/809-checker-invoke-super-bss/expected.txt
rename to test/809-checker-invoke-super-bss/expected-stdout.txt

test/810-checker-invoke-super-default/expected-stdout.txt

diff --git a/test/810-checker-invoke-super-default/expected.txt b/test/810-checker-invoke-super-default/expected-stdout.txt
similarity index 100%
rename from test/810-checker-invoke-super-default/expected.txt
rename to test/810-checker-invoke-super-default/expected-stdout.txt

test/811-checker-invoke-super-secondary/expected-stdout.txt

diff --git a/test/811-checker-invoke-super-secondary/expected.txt b/test/811-checker-invoke-super-secondary/expected-stdout.txt
similarity index 100%
rename from test/811-checker-invoke-super-secondary/expected.txt
rename to test/811-checker-invoke-super-secondary/expected-stdout.txt

test/812-recursive-default/Android.bp

diff --git a/test/812-recursive-default/Android.bp b/test/812-recursive-default/Android.bp
index 7deeecf..2f5b45e 100644
--- a/test/812-recursive-default/Android.bp
+++ b/test/812-recursive-default/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-812-recursive-default-expected"],
+    data: [":art-run-test-812-recursive-default-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-812-recursive-default-expected",
-    out: ["art-run-test-812-recursive-default-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-812-recursive-default-expected-stdout",
+    out: ["art-run-test-812-recursive-default-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/812-recursive-default/expected-stdout.txt

diff --git a/test/812-recursive-default/expected.txt b/test/812-recursive-default/expected-stdout.txt
similarity index 100%
rename from test/812-recursive-default/expected.txt
rename to test/812-recursive-default/expected-stdout.txt

test/900-hello-plugin/Android.bp

diff --git a/test/900-hello-plugin/Android.bp b/test/900-hello-plugin/Android.bp
index 4f8bbf4..7ff5fbb 100644
--- a/test/900-hello-plugin/Android.bp
+++ b/test/900-hello-plugin/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-900-hello-plugin-expected"],
+    data: [":art-run-test-900-hello-plugin-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-900-hello-plugin-expected",
-    out: ["art-run-test-900-hello-plugin-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-900-hello-plugin-expected-stdout",
+    out: ["art-run-test-900-hello-plugin-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/900-hello-plugin/expected-stdout.txt

diff --git a/test/900-hello-plugin/expected.txt b/test/900-hello-plugin/expected-stdout.txt
similarity index 100%
rename from test/900-hello-plugin/expected.txt
rename to test/900-hello-plugin/expected-stdout.txt

test/901-hello-ti-agent/Android.bp

diff --git a/test/901-hello-ti-agent/Android.bp b/test/901-hello-ti-agent/Android.bp
index 25366fc..cd0b9f0 100644
--- a/test/901-hello-ti-agent/Android.bp
+++ b/test/901-hello-ti-agent/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-901-hello-ti-agent-expected"],
+    data: [":art-run-test-901-hello-ti-agent-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-901-hello-ti-agent-expected",
-    out: ["art-run-test-901-hello-ti-agent-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-901-hello-ti-agent-expected-stdout",
+    out: ["art-run-test-901-hello-ti-agent-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/901-hello-ti-agent/expected-stdout.txt

diff --git a/test/901-hello-ti-agent/expected.txt b/test/901-hello-ti-agent/expected-stdout.txt
similarity index 100%
rename from test/901-hello-ti-agent/expected.txt
rename to test/901-hello-ti-agent/expected-stdout.txt

test/902-hello-transformation/Android.bp

diff --git a/test/902-hello-transformation/Android.bp b/test/902-hello-transformation/Android.bp
index 8786f8a..734fb91 100644
--- a/test/902-hello-transformation/Android.bp
+++ b/test/902-hello-transformation/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-902-hello-transformation-expected"],
+    data: [":art-run-test-902-hello-transformation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-902-hello-transformation-expected",
-    out: ["art-run-test-902-hello-transformation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-902-hello-transformation-expected-stdout",
+    out: ["art-run-test-902-hello-transformation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/902-hello-transformation/expected-stdout.txt

diff --git a/test/902-hello-transformation/expected.txt b/test/902-hello-transformation/expected-stdout.txt
similarity index 100%
rename from test/902-hello-transformation/expected.txt
rename to test/902-hello-transformation/expected-stdout.txt

test/903-hello-tagging/Android.bp

diff --git a/test/903-hello-tagging/Android.bp b/test/903-hello-tagging/Android.bp
index ccbe23b..d924634 100644
--- a/test/903-hello-tagging/Android.bp
+++ b/test/903-hello-tagging/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-903-hello-tagging-expected"],
+    data: [":art-run-test-903-hello-tagging-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-903-hello-tagging-expected",
-    out: ["art-run-test-903-hello-tagging-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-903-hello-tagging-expected-stdout",
+    out: ["art-run-test-903-hello-tagging-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/903-hello-tagging/expected-stdout.txt

diff --git a/test/903-hello-tagging/expected.txt b/test/903-hello-tagging/expected-stdout.txt
similarity index 100%
rename from test/903-hello-tagging/expected.txt
rename to test/903-hello-tagging/expected-stdout.txt

test/904-object-allocation/Android.bp

diff --git a/test/904-object-allocation/Android.bp b/test/904-object-allocation/Android.bp
index 32f12dc..cb46af5 100644
--- a/test/904-object-allocation/Android.bp
+++ b/test/904-object-allocation/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-904-object-allocation-expected"],
+    data: [":art-run-test-904-object-allocation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-904-object-allocation-expected",
-    out: ["art-run-test-904-object-allocation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-904-object-allocation-expected-stdout",
+    out: ["art-run-test-904-object-allocation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/904-object-allocation/expected-stdout.txt

diff --git a/test/904-object-allocation/expected.txt b/test/904-object-allocation/expected-stdout.txt
similarity index 100%
rename from test/904-object-allocation/expected.txt
rename to test/904-object-allocation/expected-stdout.txt

test/905-object-free/Android.bp

diff --git a/test/905-object-free/Android.bp b/test/905-object-free/Android.bp
index 1914fc9..07e7bf8 100644
--- a/test/905-object-free/Android.bp
+++ b/test/905-object-free/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-905-object-free-expected"],
+    data: [":art-run-test-905-object-free-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-905-object-free-expected",
-    out: ["art-run-test-905-object-free-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-905-object-free-expected-stdout",
+    out: ["art-run-test-905-object-free-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/905-object-free/expected-stdout.txt

diff --git a/test/905-object-free/expected.txt b/test/905-object-free/expected-stdout.txt
similarity index 100%
rename from test/905-object-free/expected.txt
rename to test/905-object-free/expected-stdout.txt

test/906-iterate-heap/Android.bp

diff --git a/test/906-iterate-heap/Android.bp b/test/906-iterate-heap/Android.bp
index 7bfc927..d248bff 100644
--- a/test/906-iterate-heap/Android.bp
+++ b/test/906-iterate-heap/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-906-iterate-heap-expected"],
+    data: [":art-run-test-906-iterate-heap-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-906-iterate-heap-expected",
-    out: ["art-run-test-906-iterate-heap-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-906-iterate-heap-expected-stdout",
+    out: ["art-run-test-906-iterate-heap-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/906-iterate-heap/expected-stdout.txt

diff --git a/test/906-iterate-heap/expected.txt b/test/906-iterate-heap/expected-stdout.txt
similarity index 100%
rename from test/906-iterate-heap/expected.txt
rename to test/906-iterate-heap/expected-stdout.txt

test/907-get-loaded-classes/Android.bp

diff --git a/test/907-get-loaded-classes/Android.bp b/test/907-get-loaded-classes/Android.bp
index 1161fec..fd93096 100644
--- a/test/907-get-loaded-classes/Android.bp
+++ b/test/907-get-loaded-classes/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-907-get-loaded-classes-expected"],
+    data: [":art-run-test-907-get-loaded-classes-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-907-get-loaded-classes-expected",
-    out: ["art-run-test-907-get-loaded-classes-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-907-get-loaded-classes-expected-stdout",
+    out: ["art-run-test-907-get-loaded-classes-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/907-get-loaded-classes/expected-stdout.txt

diff --git a/test/907-get-loaded-classes/expected.txt b/test/907-get-loaded-classes/expected-stdout.txt
similarity index 100%
rename from test/907-get-loaded-classes/expected.txt
rename to test/907-get-loaded-classes/expected-stdout.txt

test/908-gc-start-finish/Android.bp

diff --git a/test/908-gc-start-finish/Android.bp b/test/908-gc-start-finish/Android.bp
index 5a2fb4b..e5f1865 100644
--- a/test/908-gc-start-finish/Android.bp
+++ b/test/908-gc-start-finish/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-908-gc-start-finish-expected"],
+    data: [":art-run-test-908-gc-start-finish-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-908-gc-start-finish-expected",
-    out: ["art-run-test-908-gc-start-finish-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-908-gc-start-finish-expected-stdout",
+    out: ["art-run-test-908-gc-start-finish-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/908-gc-start-finish/expected-stdout.txt

diff --git a/test/908-gc-start-finish/expected.txt b/test/908-gc-start-finish/expected-stdout.txt
similarity index 100%
rename from test/908-gc-start-finish/expected.txt
rename to test/908-gc-start-finish/expected-stdout.txt

test/909-attach-agent/expected-stdout.txt

diff --git a/test/909-attach-agent/expected.txt b/test/909-attach-agent/expected-stdout.txt
similarity index 100%
rename from test/909-attach-agent/expected.txt
rename to test/909-attach-agent/expected-stdout.txt

test/909-attach-agent/run

diff --git a/test/909-attach-agent/run b/test/909-attach-agent/run
index add558e..71b1e1c 100755
--- a/test/909-attach-agent/run
+++ b/test/909-attach-agent/run
@@ -25,7 +25,7 @@
   # On interpreter we are fully capable of providing the full jvmti api so we
   # have a slightly different expected output.
   # TODO We should really be changing this in the 'check' script.
-  patch -s expected.txt <interpreter-expected.patch
+  patch -s expected-stdout.txt <interpreter-expected.patch
 fi
 
 # Provide additional runtime options when running on device.

test/910-methods/Android.bp

diff --git a/test/910-methods/Android.bp b/test/910-methods/Android.bp
index a469a91..e017242 100644
--- a/test/910-methods/Android.bp
+++ b/test/910-methods/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-910-methods-expected"],
+    data: [":art-run-test-910-methods-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-910-methods-expected",
-    out: ["art-run-test-910-methods-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-910-methods-expected-stdout",
+    out: ["art-run-test-910-methods-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/910-methods/expected-stdout.txt

diff --git a/test/910-methods/expected.txt b/test/910-methods/expected-stdout.txt
similarity index 100%
rename from test/910-methods/expected.txt
rename to test/910-methods/expected-stdout.txt

test/911-get-stack-trace/Android.bp

diff --git a/test/911-get-stack-trace/Android.bp b/test/911-get-stack-trace/Android.bp
index 753e9cb..e75222f 100644
--- a/test/911-get-stack-trace/Android.bp
+++ b/test/911-get-stack-trace/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-911-get-stack-trace-expected"],
+    data: [":art-run-test-911-get-stack-trace-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-911-get-stack-trace-expected",
-    out: ["art-run-test-911-get-stack-trace-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-911-get-stack-trace-expected-stdout",
+    out: ["art-run-test-911-get-stack-trace-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/911-get-stack-trace/expected-stdout.txt

diff --git a/test/911-get-stack-trace/expected.txt b/test/911-get-stack-trace/expected-stdout.txt
similarity index 100%
rename from test/911-get-stack-trace/expected.txt
rename to test/911-get-stack-trace/expected-stdout.txt

test/912-classes/expected-stdout.txt

diff --git a/test/912-classes/expected.txt b/test/912-classes/expected-stdout.txt
similarity index 100%
rename from test/912-classes/expected.txt
rename to test/912-classes/expected-stdout.txt

test/913-heaps/Android.bp

diff --git a/test/913-heaps/Android.bp b/test/913-heaps/Android.bp
index 8b1a4f1..6ef49ad 100644
--- a/test/913-heaps/Android.bp
+++ b/test/913-heaps/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-913-heaps-expected"],
+    data: [":art-run-test-913-heaps-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-913-heaps-expected",
-    out: ["art-run-test-913-heaps-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-913-heaps-expected-stdout",
+    out: ["art-run-test-913-heaps-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/913-heaps/expected-stdout.txt

diff --git a/test/913-heaps/expected.txt b/test/913-heaps/expected-stdout.txt
similarity index 100%
rename from test/913-heaps/expected.txt
rename to test/913-heaps/expected-stdout.txt

test/914-hello-obsolescence/Android.bp

diff --git a/test/914-hello-obsolescence/Android.bp b/test/914-hello-obsolescence/Android.bp
index c13ce40..5057f43 100644
--- a/test/914-hello-obsolescence/Android.bp
+++ b/test/914-hello-obsolescence/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-914-hello-obsolescence-expected"],
+    data: [":art-run-test-914-hello-obsolescence-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-914-hello-obsolescence-expected",
-    out: ["art-run-test-914-hello-obsolescence-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-914-hello-obsolescence-expected-stdout",
+    out: ["art-run-test-914-hello-obsolescence-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/914-hello-obsolescence/expected-stdout.txt

diff --git a/test/914-hello-obsolescence/expected.txt b/test/914-hello-obsolescence/expected-stdout.txt
similarity index 100%
rename from test/914-hello-obsolescence/expected.txt
rename to test/914-hello-obsolescence/expected-stdout.txt

test/915-obsolete-2/Android.bp

diff --git a/test/915-obsolete-2/Android.bp b/test/915-obsolete-2/Android.bp
index 6acd1cb..5c1669b 100644
--- a/test/915-obsolete-2/Android.bp
+++ b/test/915-obsolete-2/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-915-obsolete-2-expected"],
+    data: [":art-run-test-915-obsolete-2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-915-obsolete-2-expected",
-    out: ["art-run-test-915-obsolete-2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-915-obsolete-2-expected-stdout",
+    out: ["art-run-test-915-obsolete-2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/915-obsolete-2/expected-stdout.txt

diff --git a/test/915-obsolete-2/expected.txt b/test/915-obsolete-2/expected-stdout.txt
similarity index 100%
rename from test/915-obsolete-2/expected.txt
rename to test/915-obsolete-2/expected-stdout.txt

test/916-obsolete-jit/Android.bp

diff --git a/test/916-obsolete-jit/Android.bp b/test/916-obsolete-jit/Android.bp
index 0bba027..3db5d3c 100644
--- a/test/916-obsolete-jit/Android.bp
+++ b/test/916-obsolete-jit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-916-obsolete-jit-expected"],
+    data: [":art-run-test-916-obsolete-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-916-obsolete-jit-expected",
-    out: ["art-run-test-916-obsolete-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-916-obsolete-jit-expected-stdout",
+    out: ["art-run-test-916-obsolete-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/916-obsolete-jit/expected-stdout.txt

diff --git a/test/916-obsolete-jit/expected.txt b/test/916-obsolete-jit/expected-stdout.txt
similarity index 100%
rename from test/916-obsolete-jit/expected.txt
rename to test/916-obsolete-jit/expected-stdout.txt

test/917-fields-transformation/Android.bp

diff --git a/test/917-fields-transformation/Android.bp b/test/917-fields-transformation/Android.bp
index 0661468..f7e3d66 100644
--- a/test/917-fields-transformation/Android.bp
+++ b/test/917-fields-transformation/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-917-fields-transformation-expected"],
+    data: [":art-run-test-917-fields-transformation-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-917-fields-transformation-expected",
-    out: ["art-run-test-917-fields-transformation-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-917-fields-transformation-expected-stdout",
+    out: ["art-run-test-917-fields-transformation-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/917-fields-transformation/expected-stdout.txt

diff --git a/test/917-fields-transformation/expected.txt b/test/917-fields-transformation/expected-stdout.txt
similarity index 100%
rename from test/917-fields-transformation/expected.txt
rename to test/917-fields-transformation/expected-stdout.txt

test/918-fields/Android.bp

diff --git a/test/918-fields/Android.bp b/test/918-fields/Android.bp
index bf8dc9b..73395c2 100644
--- a/test/918-fields/Android.bp
+++ b/test/918-fields/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-918-fields-expected"],
+    data: [":art-run-test-918-fields-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-918-fields-expected",
-    out: ["art-run-test-918-fields-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-918-fields-expected-stdout",
+    out: ["art-run-test-918-fields-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/918-fields/expected-stdout.txt

diff --git a/test/918-fields/expected.txt b/test/918-fields/expected-stdout.txt
similarity index 100%
rename from test/918-fields/expected.txt
rename to test/918-fields/expected-stdout.txt

test/919-obsolete-fields/Android.bp

diff --git a/test/919-obsolete-fields/Android.bp b/test/919-obsolete-fields/Android.bp
index 03b7fd2..02abafd 100644
--- a/test/919-obsolete-fields/Android.bp
+++ b/test/919-obsolete-fields/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-919-obsolete-fields-expected"],
+    data: [":art-run-test-919-obsolete-fields-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-919-obsolete-fields-expected",
-    out: ["art-run-test-919-obsolete-fields-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-919-obsolete-fields-expected-stdout",
+    out: ["art-run-test-919-obsolete-fields-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/919-obsolete-fields/expected-stdout.txt

diff --git a/test/919-obsolete-fields/expected.txt b/test/919-obsolete-fields/expected-stdout.txt
similarity index 100%
rename from test/919-obsolete-fields/expected.txt
rename to test/919-obsolete-fields/expected-stdout.txt

test/920-objects/Android.bp

diff --git a/test/920-objects/Android.bp b/test/920-objects/Android.bp
index ea73bba..984d4a3 100644
--- a/test/920-objects/Android.bp
+++ b/test/920-objects/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-920-objects-expected"],
+    data: [":art-run-test-920-objects-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-920-objects-expected",
-    out: ["art-run-test-920-objects-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-920-objects-expected-stdout",
+    out: ["art-run-test-920-objects-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/920-objects/expected-stdout.txt

diff --git a/test/920-objects/expected.txt b/test/920-objects/expected-stdout.txt
similarity index 100%
rename from test/920-objects/expected.txt
rename to test/920-objects/expected-stdout.txt

test/921-hello-failure/Android.bp

diff --git a/test/921-hello-failure/Android.bp b/test/921-hello-failure/Android.bp
index 6a2c34d..40768a6 100644
--- a/test/921-hello-failure/Android.bp
+++ b/test/921-hello-failure/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-921-hello-failure-expected"],
+    data: [":art-run-test-921-hello-failure-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-921-hello-failure-expected",
-    out: ["art-run-test-921-hello-failure-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-921-hello-failure-expected-stdout",
+    out: ["art-run-test-921-hello-failure-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/921-hello-failure/expected-stdout.txt

diff --git a/test/921-hello-failure/expected.txt b/test/921-hello-failure/expected-stdout.txt
similarity index 100%
rename from test/921-hello-failure/expected.txt
rename to test/921-hello-failure/expected-stdout.txt

test/922-properties/Android.bp

diff --git a/test/922-properties/Android.bp b/test/922-properties/Android.bp
index fb4cc99..594611d 100644
--- a/test/922-properties/Android.bp
+++ b/test/922-properties/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-922-properties-expected"],
+    data: [":art-run-test-922-properties-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-922-properties-expected",
-    out: ["art-run-test-922-properties-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-922-properties-expected-stdout",
+    out: ["art-run-test-922-properties-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/922-properties/expected-stdout.txt

diff --git a/test/922-properties/expected.txt b/test/922-properties/expected-stdout.txt
similarity index 100%
rename from test/922-properties/expected.txt
rename to test/922-properties/expected-stdout.txt

test/923-monitors/Android.bp

diff --git a/test/923-monitors/Android.bp b/test/923-monitors/Android.bp
index 75b5464..cf4262b 100644
--- a/test/923-monitors/Android.bp
+++ b/test/923-monitors/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-923-monitors-expected"],
+    data: [":art-run-test-923-monitors-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-923-monitors-expected",
-    out: ["art-run-test-923-monitors-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-923-monitors-expected-stdout",
+    out: ["art-run-test-923-monitors-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/923-monitors/expected-stdout.txt

diff --git a/test/923-monitors/expected.txt b/test/923-monitors/expected-stdout.txt
similarity index 100%
rename from test/923-monitors/expected.txt
rename to test/923-monitors/expected-stdout.txt

test/924-threads/Android.bp

diff --git a/test/924-threads/Android.bp b/test/924-threads/Android.bp
index 40427cd..052f82b 100644
--- a/test/924-threads/Android.bp
+++ b/test/924-threads/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-924-threads-expected"],
+    data: [":art-run-test-924-threads-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-924-threads-expected",
-    out: ["art-run-test-924-threads-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-924-threads-expected-stdout",
+    out: ["art-run-test-924-threads-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/924-threads/expected-stdout.txt

diff --git a/test/924-threads/expected.txt b/test/924-threads/expected-stdout.txt
similarity index 100%
rename from test/924-threads/expected.txt
rename to test/924-threads/expected-stdout.txt

test/925-threadgroups/Android.bp

diff --git a/test/925-threadgroups/Android.bp b/test/925-threadgroups/Android.bp
index 410468e..e162963 100644
--- a/test/925-threadgroups/Android.bp
+++ b/test/925-threadgroups/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-925-threadgroups-expected"],
+    data: [":art-run-test-925-threadgroups-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-925-threadgroups-expected",
-    out: ["art-run-test-925-threadgroups-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-925-threadgroups-expected-stdout",
+    out: ["art-run-test-925-threadgroups-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/925-threadgroups/expected-stdout.txt

diff --git a/test/925-threadgroups/expected.txt b/test/925-threadgroups/expected-stdout.txt
similarity index 100%
rename from test/925-threadgroups/expected.txt
rename to test/925-threadgroups/expected-stdout.txt

test/926-multi-obsolescence/Android.bp

diff --git a/test/926-multi-obsolescence/Android.bp b/test/926-multi-obsolescence/Android.bp
index 81c3d32..07c637e 100644
--- a/test/926-multi-obsolescence/Android.bp
+++ b/test/926-multi-obsolescence/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-926-multi-obsolescence-expected"],
+    data: [":art-run-test-926-multi-obsolescence-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-926-multi-obsolescence-expected",
-    out: ["art-run-test-926-multi-obsolescence-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-926-multi-obsolescence-expected-stdout",
+    out: ["art-run-test-926-multi-obsolescence-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/926-multi-obsolescence/expected-stdout.txt

diff --git a/test/926-multi-obsolescence/expected.txt b/test/926-multi-obsolescence/expected-stdout.txt
similarity index 100%
rename from test/926-multi-obsolescence/expected.txt
rename to test/926-multi-obsolescence/expected-stdout.txt

test/927-timers/Android.bp

diff --git a/test/927-timers/Android.bp b/test/927-timers/Android.bp
index 194da57..ae3da0d 100644
--- a/test/927-timers/Android.bp
+++ b/test/927-timers/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-927-timers-expected"],
+    data: [":art-run-test-927-timers-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-927-timers-expected",
-    out: ["art-run-test-927-timers-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-927-timers-expected-stdout",
+    out: ["art-run-test-927-timers-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/927-timers/expected-stdout.txt

diff --git a/test/927-timers/expected.txt b/test/927-timers/expected-stdout.txt
similarity index 100%
rename from test/927-timers/expected.txt
rename to test/927-timers/expected-stdout.txt

test/928-jni-table/Android.bp

diff --git a/test/928-jni-table/Android.bp b/test/928-jni-table/Android.bp
index 331509c..ef63865 100644
--- a/test/928-jni-table/Android.bp
+++ b/test/928-jni-table/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-928-jni-table-expected"],
+    data: [":art-run-test-928-jni-table-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-928-jni-table-expected",
-    out: ["art-run-test-928-jni-table-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-928-jni-table-expected-stdout",
+    out: ["art-run-test-928-jni-table-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/928-jni-table/expected-stdout.txt

diff --git a/test/928-jni-table/expected.txt b/test/928-jni-table/expected-stdout.txt
similarity index 100%
rename from test/928-jni-table/expected.txt
rename to test/928-jni-table/expected-stdout.txt

test/929-search/expected-stdout.txt

diff --git a/test/929-search/expected.txt b/test/929-search/expected-stdout.txt
similarity index 100%
rename from test/929-search/expected.txt
rename to test/929-search/expected-stdout.txt

test/930-hello-retransform/Android.bp

diff --git a/test/930-hello-retransform/Android.bp b/test/930-hello-retransform/Android.bp
index 3bea013..f58261a 100644
--- a/test/930-hello-retransform/Android.bp
+++ b/test/930-hello-retransform/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-930-hello-retransform-expected"],
+    data: [":art-run-test-930-hello-retransform-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-930-hello-retransform-expected",
-    out: ["art-run-test-930-hello-retransform-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-930-hello-retransform-expected-stdout",
+    out: ["art-run-test-930-hello-retransform-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/930-hello-retransform/expected-stdout.txt

diff --git a/test/930-hello-retransform/expected.txt b/test/930-hello-retransform/expected-stdout.txt
similarity index 100%
rename from test/930-hello-retransform/expected.txt
rename to test/930-hello-retransform/expected-stdout.txt

test/931-agent-thread/Android.bp

diff --git a/test/931-agent-thread/Android.bp b/test/931-agent-thread/Android.bp
index 6d594c0..793da2d 100644
--- a/test/931-agent-thread/Android.bp
+++ b/test/931-agent-thread/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-931-agent-thread-expected"],
+    data: [":art-run-test-931-agent-thread-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-931-agent-thread-expected",
-    out: ["art-run-test-931-agent-thread-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-931-agent-thread-expected-stdout",
+    out: ["art-run-test-931-agent-thread-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/931-agent-thread/expected-stdout.txt

diff --git a/test/931-agent-thread/expected.txt b/test/931-agent-thread/expected-stdout.txt
similarity index 100%
rename from test/931-agent-thread/expected.txt
rename to test/931-agent-thread/expected-stdout.txt

test/932-transform-saves/Android.bp

diff --git a/test/932-transform-saves/Android.bp b/test/932-transform-saves/Android.bp
index a86603b..022a8cb 100644
--- a/test/932-transform-saves/Android.bp
+++ b/test/932-transform-saves/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-932-transform-saves-expected"],
+    data: [":art-run-test-932-transform-saves-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-932-transform-saves-expected",
-    out: ["art-run-test-932-transform-saves-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-932-transform-saves-expected-stdout",
+    out: ["art-run-test-932-transform-saves-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/932-transform-saves/expected-stdout.txt

diff --git a/test/932-transform-saves/expected.txt b/test/932-transform-saves/expected-stdout.txt
similarity index 100%
rename from test/932-transform-saves/expected.txt
rename to test/932-transform-saves/expected-stdout.txt

test/933-misc-events/Android.bp

diff --git a/test/933-misc-events/Android.bp b/test/933-misc-events/Android.bp
index d943ebc..01fdefc 100644
--- a/test/933-misc-events/Android.bp
+++ b/test/933-misc-events/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-933-misc-events-expected"],
+    data: [":art-run-test-933-misc-events-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-933-misc-events-expected",
-    out: ["art-run-test-933-misc-events-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-933-misc-events-expected-stdout",
+    out: ["art-run-test-933-misc-events-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/933-misc-events/expected-stdout.txt

diff --git a/test/933-misc-events/expected.txt b/test/933-misc-events/expected-stdout.txt
similarity index 100%
rename from test/933-misc-events/expected.txt
rename to test/933-misc-events/expected-stdout.txt

test/934-load-transform/expected-stdout.txt

diff --git a/test/934-load-transform/expected.txt b/test/934-load-transform/expected-stdout.txt
similarity index 100%
rename from test/934-load-transform/expected.txt
rename to test/934-load-transform/expected-stdout.txt

test/935-non-retransformable/expected-stdout.txt

diff --git a/test/935-non-retransformable/expected.txt b/test/935-non-retransformable/expected-stdout.txt
similarity index 100%
rename from test/935-non-retransformable/expected.txt
rename to test/935-non-retransformable/expected-stdout.txt

test/936-search-onload/expected-stdout.txt

diff --git a/test/936-search-onload/expected.txt b/test/936-search-onload/expected-stdout.txt
similarity index 100%
rename from test/936-search-onload/expected.txt
rename to test/936-search-onload/expected-stdout.txt

test/937-hello-retransform-package/Android.bp

diff --git a/test/937-hello-retransform-package/Android.bp b/test/937-hello-retransform-package/Android.bp
index b2ee4b9..54f12bb 100644
--- a/test/937-hello-retransform-package/Android.bp
+++ b/test/937-hello-retransform-package/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-937-hello-retransform-package-expected"],
+    data: [":art-run-test-937-hello-retransform-package-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-937-hello-retransform-package-expected",
-    out: ["art-run-test-937-hello-retransform-package-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-937-hello-retransform-package-expected-stdout",
+    out: ["art-run-test-937-hello-retransform-package-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/937-hello-retransform-package/expected-stdout.txt

diff --git a/test/937-hello-retransform-package/expected.txt b/test/937-hello-retransform-package/expected-stdout.txt
similarity index 100%
rename from test/937-hello-retransform-package/expected.txt
rename to test/937-hello-retransform-package/expected-stdout.txt

test/938-load-transform-bcp/expected-stdout.txt

diff --git a/test/938-load-transform-bcp/expected.txt b/test/938-load-transform-bcp/expected-stdout.txt
similarity index 100%
rename from test/938-load-transform-bcp/expected.txt
rename to test/938-load-transform-bcp/expected-stdout.txt

test/939-hello-transformation-bcp/Android.bp

diff --git a/test/939-hello-transformation-bcp/Android.bp b/test/939-hello-transformation-bcp/Android.bp
index adb1b91..2f32376 100644
--- a/test/939-hello-transformation-bcp/Android.bp
+++ b/test/939-hello-transformation-bcp/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-939-hello-transformation-bcp-expected"],
+    data: [":art-run-test-939-hello-transformation-bcp-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-939-hello-transformation-bcp-expected",
-    out: ["art-run-test-939-hello-transformation-bcp-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-939-hello-transformation-bcp-expected-stdout",
+    out: ["art-run-test-939-hello-transformation-bcp-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/939-hello-transformation-bcp/expected-stdout.txt

diff --git a/test/939-hello-transformation-bcp/expected.txt b/test/939-hello-transformation-bcp/expected-stdout.txt
similarity index 100%
rename from test/939-hello-transformation-bcp/expected.txt
rename to test/939-hello-transformation-bcp/expected-stdout.txt

test/940-recursive-obsolete/Android.bp

diff --git a/test/940-recursive-obsolete/Android.bp b/test/940-recursive-obsolete/Android.bp
index eab8264..baf1e50 100644
--- a/test/940-recursive-obsolete/Android.bp
+++ b/test/940-recursive-obsolete/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-940-recursive-obsolete-expected"],
+    data: [":art-run-test-940-recursive-obsolete-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-940-recursive-obsolete-expected",
-    out: ["art-run-test-940-recursive-obsolete-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-940-recursive-obsolete-expected-stdout",
+    out: ["art-run-test-940-recursive-obsolete-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/940-recursive-obsolete/expected-stdout.txt

diff --git a/test/940-recursive-obsolete/expected.txt b/test/940-recursive-obsolete/expected-stdout.txt
similarity index 100%
rename from test/940-recursive-obsolete/expected.txt
rename to test/940-recursive-obsolete/expected-stdout.txt

test/941-recursive-obsolete-jit/Android.bp

diff --git a/test/941-recursive-obsolete-jit/Android.bp b/test/941-recursive-obsolete-jit/Android.bp
index 2d11b98..166324d 100644
--- a/test/941-recursive-obsolete-jit/Android.bp
+++ b/test/941-recursive-obsolete-jit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-941-recursive-obsolete-jit-expected"],
+    data: [":art-run-test-941-recursive-obsolete-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-941-recursive-obsolete-jit-expected",
-    out: ["art-run-test-941-recursive-obsolete-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-941-recursive-obsolete-jit-expected-stdout",
+    out: ["art-run-test-941-recursive-obsolete-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/941-recursive-obsolete-jit/expected-stdout.txt

diff --git a/test/941-recursive-obsolete-jit/expected.txt b/test/941-recursive-obsolete-jit/expected-stdout.txt
similarity index 100%
rename from test/941-recursive-obsolete-jit/expected.txt
rename to test/941-recursive-obsolete-jit/expected-stdout.txt

test/942-private-recursive/Android.bp

diff --git a/test/942-private-recursive/Android.bp b/test/942-private-recursive/Android.bp
index beb8d15..a8fd9b4 100644
--- a/test/942-private-recursive/Android.bp
+++ b/test/942-private-recursive/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-942-private-recursive-expected"],
+    data: [":art-run-test-942-private-recursive-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-942-private-recursive-expected",
-    out: ["art-run-test-942-private-recursive-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-942-private-recursive-expected-stdout",
+    out: ["art-run-test-942-private-recursive-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/942-private-recursive/expected-stdout.txt

diff --git a/test/942-private-recursive/expected.txt b/test/942-private-recursive/expected-stdout.txt
similarity index 100%
rename from test/942-private-recursive/expected.txt
rename to test/942-private-recursive/expected-stdout.txt

test/943-private-recursive-jit/Android.bp

diff --git a/test/943-private-recursive-jit/Android.bp b/test/943-private-recursive-jit/Android.bp
index 0814b97..e3cd42d 100644
--- a/test/943-private-recursive-jit/Android.bp
+++ b/test/943-private-recursive-jit/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-943-private-recursive-jit-expected"],
+    data: [":art-run-test-943-private-recursive-jit-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-943-private-recursive-jit-expected",
-    out: ["art-run-test-943-private-recursive-jit-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-943-private-recursive-jit-expected-stdout",
+    out: ["art-run-test-943-private-recursive-jit-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/943-private-recursive-jit/expected-stdout.txt

diff --git a/test/943-private-recursive-jit/expected.txt b/test/943-private-recursive-jit/expected-stdout.txt
similarity index 100%
rename from test/943-private-recursive-jit/expected.txt
rename to test/943-private-recursive-jit/expected-stdout.txt

test/944-transform-classloaders/Android.bp

diff --git a/test/944-transform-classloaders/Android.bp b/test/944-transform-classloaders/Android.bp
index 8b9eca1..9348f51 100644
--- a/test/944-transform-classloaders/Android.bp
+++ b/test/944-transform-classloaders/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-944-transform-classloaders-expected"],
+    data: [":art-run-test-944-transform-classloaders-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-944-transform-classloaders-expected",
-    out: ["art-run-test-944-transform-classloaders-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-944-transform-classloaders-expected-stdout",
+    out: ["art-run-test-944-transform-classloaders-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/944-transform-classloaders/expected-stdout.txt

diff --git a/test/944-transform-classloaders/expected.txt b/test/944-transform-classloaders/expected-stdout.txt
similarity index 100%
rename from test/944-transform-classloaders/expected.txt
rename to test/944-transform-classloaders/expected-stdout.txt

test/945-obsolete-native/Android.bp

diff --git a/test/945-obsolete-native/Android.bp b/test/945-obsolete-native/Android.bp
index 97f9275..3849293 100644
--- a/test/945-obsolete-native/Android.bp
+++ b/test/945-obsolete-native/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-945-obsolete-native-expected"],
+    data: [":art-run-test-945-obsolete-native-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-945-obsolete-native-expected",
-    out: ["art-run-test-945-obsolete-native-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-945-obsolete-native-expected-stdout",
+    out: ["art-run-test-945-obsolete-native-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/945-obsolete-native/expected-stdout.txt

diff --git a/test/945-obsolete-native/expected.txt b/test/945-obsolete-native/expected-stdout.txt
similarity index 100%
rename from test/945-obsolete-native/expected.txt
rename to test/945-obsolete-native/expected-stdout.txt

test/946-obsolete-throw/Android.bp

diff --git a/test/946-obsolete-throw/Android.bp b/test/946-obsolete-throw/Android.bp
index 2462bcf..d02117f 100644
--- a/test/946-obsolete-throw/Android.bp
+++ b/test/946-obsolete-throw/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-946-obsolete-throw-expected"],
+    data: [":art-run-test-946-obsolete-throw-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-946-obsolete-throw-expected",
-    out: ["art-run-test-946-obsolete-throw-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-946-obsolete-throw-expected-stdout",
+    out: ["art-run-test-946-obsolete-throw-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/946-obsolete-throw/expected-stdout.txt

diff --git a/test/946-obsolete-throw/expected.txt b/test/946-obsolete-throw/expected-stdout.txt
similarity index 100%
rename from test/946-obsolete-throw/expected.txt
rename to test/946-obsolete-throw/expected-stdout.txt

test/947-reflect-method/Android.bp

diff --git a/test/947-reflect-method/Android.bp b/test/947-reflect-method/Android.bp
index 9fa7a56..880cbd6 100644
--- a/test/947-reflect-method/Android.bp
+++ b/test/947-reflect-method/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-947-reflect-method-expected"],
+    data: [":art-run-test-947-reflect-method-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-947-reflect-method-expected",
-    out: ["art-run-test-947-reflect-method-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-947-reflect-method-expected-stdout",
+    out: ["art-run-test-947-reflect-method-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/947-reflect-method/expected-stdout.txt

diff --git a/test/947-reflect-method/expected.txt b/test/947-reflect-method/expected-stdout.txt
similarity index 100%
rename from test/947-reflect-method/expected.txt
rename to test/947-reflect-method/expected-stdout.txt

test/948-change-annotations/expected-stdout.txt

diff --git a/test/948-change-annotations/expected.txt b/test/948-change-annotations/expected-stdout.txt
similarity index 100%
rename from test/948-change-annotations/expected.txt
rename to test/948-change-annotations/expected-stdout.txt

test/949-in-memory-transform/Android.bp

diff --git a/test/949-in-memory-transform/Android.bp b/test/949-in-memory-transform/Android.bp
index 257285c..c5c6082 100644
--- a/test/949-in-memory-transform/Android.bp
+++ b/test/949-in-memory-transform/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-949-in-memory-transform-expected"],
+    data: [":art-run-test-949-in-memory-transform-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-949-in-memory-transform-expected",
-    out: ["art-run-test-949-in-memory-transform-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-949-in-memory-transform-expected-stdout",
+    out: ["art-run-test-949-in-memory-transform-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/949-in-memory-transform/expected-stdout.txt

diff --git a/test/949-in-memory-transform/expected.txt b/test/949-in-memory-transform/expected-stdout.txt
similarity index 100%
rename from test/949-in-memory-transform/expected.txt
rename to test/949-in-memory-transform/expected-stdout.txt

test/950-redefine-intrinsic/Android.bp

diff --git a/test/950-redefine-intrinsic/Android.bp b/test/950-redefine-intrinsic/Android.bp
index 858c6cc..cd4e610 100644
--- a/test/950-redefine-intrinsic/Android.bp
+++ b/test/950-redefine-intrinsic/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-950-redefine-intrinsic-expected"],
+    data: [":art-run-test-950-redefine-intrinsic-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-950-redefine-intrinsic-expected",
-    out: ["art-run-test-950-redefine-intrinsic-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-950-redefine-intrinsic-expected-stdout",
+    out: ["art-run-test-950-redefine-intrinsic-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/950-redefine-intrinsic/expected-stdout.txt

diff --git a/test/950-redefine-intrinsic/expected.txt b/test/950-redefine-intrinsic/expected-stdout.txt
similarity index 100%
rename from test/950-redefine-intrinsic/expected.txt
rename to test/950-redefine-intrinsic/expected-stdout.txt

test/951-threaded-obsolete/Android.bp

diff --git a/test/951-threaded-obsolete/Android.bp b/test/951-threaded-obsolete/Android.bp
index 0adfe98..2aa4901 100644
--- a/test/951-threaded-obsolete/Android.bp
+++ b/test/951-threaded-obsolete/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-951-threaded-obsolete-expected"],
+    data: [":art-run-test-951-threaded-obsolete-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-951-threaded-obsolete-expected",
-    out: ["art-run-test-951-threaded-obsolete-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-951-threaded-obsolete-expected-stdout",
+    out: ["art-run-test-951-threaded-obsolete-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/951-threaded-obsolete/expected-stdout.txt

diff --git a/test/951-threaded-obsolete/expected.txt b/test/951-threaded-obsolete/expected-stdout.txt
similarity index 100%
rename from test/951-threaded-obsolete/expected.txt
rename to test/951-threaded-obsolete/expected-stdout.txt

test/952-invoke-custom/expected-stdout.txt

diff --git a/test/952-invoke-custom/expected.txt b/test/952-invoke-custom/expected-stdout.txt
similarity index 100%
rename from test/952-invoke-custom/expected.txt
rename to test/952-invoke-custom/expected-stdout.txt

test/953-invoke-polymorphic-compiler/expected-stdout.txt

diff --git a/test/953-invoke-polymorphic-compiler/expected.txt b/test/953-invoke-polymorphic-compiler/expected-stdout.txt
similarity index 100%
rename from test/953-invoke-polymorphic-compiler/expected.txt
rename to test/953-invoke-polymorphic-compiler/expected-stdout.txt

test/954-invoke-polymorphic-verifier/expected-stdout.txt

diff --git a/test/954-invoke-polymorphic-verifier/expected.txt b/test/954-invoke-polymorphic-verifier/expected-stdout.txt
similarity index 100%
rename from test/954-invoke-polymorphic-verifier/expected.txt
rename to test/954-invoke-polymorphic-verifier/expected-stdout.txt

test/955-methodhandles-smali/expected-stdout.txt

diff --git a/test/955-methodhandles-smali/expected.txt b/test/955-methodhandles-smali/expected-stdout.txt
similarity index 100%
rename from test/955-methodhandles-smali/expected.txt
rename to test/955-methodhandles-smali/expected-stdout.txt

test/956-methodhandles/expected-stdout.txt

diff --git a/test/956-methodhandles/expected.txt b/test/956-methodhandles/expected-stdout.txt
similarity index 100%
rename from test/956-methodhandles/expected.txt
rename to test/956-methodhandles/expected-stdout.txt

test/957-methodhandle-transforms/expected-stdout.txt

diff --git a/test/957-methodhandle-transforms/expected.txt b/test/957-methodhandle-transforms/expected-stdout.txt
similarity index 100%
rename from test/957-methodhandle-transforms/expected.txt
rename to test/957-methodhandle-transforms/expected-stdout.txt

test/958-methodhandle-stackframe/expected-stdout.txt

diff --git a/test/958-methodhandle-stackframe/expected.txt b/test/958-methodhandle-stackframe/expected-stdout.txt
similarity index 100%
rename from test/958-methodhandle-stackframe/expected.txt
rename to test/958-methodhandle-stackframe/expected-stdout.txt

test/959-invoke-polymorphic-accessors/expected-stdout.txt

diff --git a/test/959-invoke-polymorphic-accessors/expected.txt b/test/959-invoke-polymorphic-accessors/expected-stdout.txt
similarity index 100%
rename from test/959-invoke-polymorphic-accessors/expected.txt
rename to test/959-invoke-polymorphic-accessors/expected-stdout.txt

test/960-default-smali/expected-stdout.txt

diff --git a/test/960-default-smali/expected.txt b/test/960-default-smali/expected-stdout.txt
similarity index 100%
rename from test/960-default-smali/expected.txt
rename to test/960-default-smali/expected-stdout.txt

test/960-default-smali/info.txt

diff --git a/test/960-default-smali/info.txt b/test/960-default-smali/info.txt
index 9583abb..cb525a2 100644
--- a/test/960-default-smali/info.txt
+++ b/test/960-default-smali/info.txt
@@ -17,4 +17,4 @@
     <Add new classes/interfaces>
     <Add these classes/interfaces to ./smali/classes.xml>
     JAVA_HOME="/path/to/java-8-jdk" ../run-test --use-java-home --update --jvm --host 956-default-smali
-    git add ./smali/classes.xml ./expected.txt
+    git add ./smali/classes.xml ./expected-stdout.txt

test/961-default-iface-resolution-gen/build

diff --git a/test/961-default-iface-resolution-gen/build b/test/961-default-iface-resolution-gen/build
index 1d24589..b9b36d0 100755
--- a/test/961-default-iface-resolution-gen/build
+++ b/test/961-default-iface-resolution-gen/build
@@ -19,7 +19,7 @@
 
 mkdir -p ./src
 
-# Generate the smali files and expected.txt or fail
-./util-src/generate_java.py ./src ./expected.txt
+# Generate the smali files and expected-stdout.txt or fail
+./util-src/generate_java.py ./src ./expected-stdout.txt
 
 ./default-build "$@" --experimental default-methods

test/961-default-iface-resolution-gen/expected-stdout.txt

diff --git a/test/961-default-iface-resolution-gen/expected.txt b/test/961-default-iface-resolution-gen/expected-stdout.txt
similarity index 100%
rename from test/961-default-iface-resolution-gen/expected.txt
rename to test/961-default-iface-resolution-gen/expected-stdout.txt

test/961-default-iface-resolution-gen/info.txt

diff --git a/test/961-default-iface-resolution-gen/info.txt b/test/961-default-iface-resolution-gen/info.txt
index 2cd2cc7..b5a04fd 100644
--- a/test/961-default-iface-resolution-gen/info.txt
+++ b/test/961-default-iface-resolution-gen/info.txt
@@ -13,5 +13,5 @@
 return equivalent output when run multiple times and the expected output should
 be valid.
 
-Do not modify the expected.txt file. It is generated on each run by
+Do not modify the expected-stdout.txt file. It is generated on each run by
 util-src/generate_smali.py.

test/962-iface-static/expected-stdout.txt

diff --git a/test/962-iface-static/expected.txt b/test/962-iface-static/expected-stdout.txt
similarity index 100%
rename from test/962-iface-static/expected.txt
rename to test/962-iface-static/expected-stdout.txt

test/963-default-range-smali/Android.bp

diff --git a/test/963-default-range-smali/Android.bp b/test/963-default-range-smali/Android.bp
index 71d0242..0ad2cae 100644
--- a/test/963-default-range-smali/Android.bp
+++ b/test/963-default-range-smali/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-963-default-range-smali-expected"],
+    data: [":art-run-test-963-default-range-smali-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-963-default-range-smali-expected",
-    out: ["art-run-test-963-default-range-smali-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-963-default-range-smali-expected-stdout",
+    out: ["art-run-test-963-default-range-smali-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/963-default-range-smali/expected-stdout.txt

diff --git a/test/963-default-range-smali/expected.txt b/test/963-default-range-smali/expected-stdout.txt
similarity index 100%
rename from test/963-default-range-smali/expected.txt
rename to test/963-default-range-smali/expected-stdout.txt

test/964-default-iface-init-gen/build

diff --git a/test/964-default-iface-init-gen/build b/test/964-default-iface-init-gen/build
index 1d24589..b9b36d0 100755
--- a/test/964-default-iface-init-gen/build
+++ b/test/964-default-iface-init-gen/build
@@ -19,7 +19,7 @@
 
 mkdir -p ./src
 
-# Generate the smali files and expected.txt or fail
-./util-src/generate_java.py ./src ./expected.txt
+# Generate the smali files and expected-stdout.txt or fail
+./util-src/generate_java.py ./src ./expected-stdout.txt
 
 ./default-build "$@" --experimental default-methods

test/964-default-iface-init-gen/expected-stdout.txt

diff --git a/test/964-default-iface-init-gen/expected.txt b/test/964-default-iface-init-gen/expected-stdout.txt
similarity index 100%
rename from test/964-default-iface-init-gen/expected.txt
rename to test/964-default-iface-init-gen/expected-stdout.txt

test/964-default-iface-init-gen/info.txt

diff --git a/test/964-default-iface-init-gen/info.txt b/test/964-default-iface-init-gen/info.txt
index 5805a86..641fd03 100644
--- a/test/964-default-iface-init-gen/info.txt
+++ b/test/964-default-iface-init-gen/info.txt
@@ -13,5 +13,5 @@
 return equivalent output when run multiple times and the expected output should
 be valid.
 
-Do not modify the expected.txt file. It is generated on each run by
+Do not modify the expected-stdout.txt file. It is generated on each run by
 util-src/generate_smali.py.

test/965-default-verify/expected-stdout.txt

diff --git a/test/965-default-verify/expected.txt b/test/965-default-verify/expected-stdout.txt
similarity index 100%
rename from test/965-default-verify/expected.txt
rename to test/965-default-verify/expected-stdout.txt

test/966-default-conflict/expected-stdout.txt

diff --git a/test/966-default-conflict/expected.txt b/test/966-default-conflict/expected-stdout.txt
similarity index 100%
rename from test/966-default-conflict/expected.txt
rename to test/966-default-conflict/expected-stdout.txt

test/967-default-ame/expected-stdout.txt

diff --git a/test/967-default-ame/expected.txt b/test/967-default-ame/expected-stdout.txt
similarity index 100%
rename from test/967-default-ame/expected.txt
rename to test/967-default-ame/expected-stdout.txt

test/968-default-partial-compile-gen/build

diff --git a/test/968-default-partial-compile-gen/build b/test/968-default-partial-compile-gen/build
index c8f0384..38e84a5 100755
--- a/test/968-default-partial-compile-gen/build
+++ b/test/968-default-partial-compile-gen/build
@@ -23,14 +23,14 @@
   mkdir -p src
   echo "${JAVAC} \$@" >> ./javac_exec.sh
   # This will use java_exec.sh to execute the javac compiler. It will place the
-  # compiled class files in ./classes and the expected values in expected.txt
+  # compiled class files in ./classes and the expected values in expected-stdout.txt
   #
   # After this the src directory will contain the final versions of all files.
-  ./util-src/generate_java.py ./javac_exec.sh ./src ./classes ./expected.txt ./build_log
+  ./util-src/generate_java.py ./javac_exec.sh ./src ./classes ./expected-stdout.txt ./build_log
 else
   mkdir -p ./smali
-  # Generate the smali files and expected.txt or fail
-  ./util-src/generate_smali.py ./smali ./expected.txt
+  # Generate the smali files and expected-stdout.txt or fail
+  ./util-src/generate_smali.py ./smali ./expected-stdout.txt
   # Use the default build script
   ./default-build "$@" "$EXTRA_ARGS" --experimental default-methods
 fi

test/968-default-partial-compile-gen/expected-stdout.txt

diff --git a/test/968-default-partial-compile-gen/expected.txt b/test/968-default-partial-compile-gen/expected-stdout.txt
similarity index 100%
rename from test/968-default-partial-compile-gen/expected.txt
rename to test/968-default-partial-compile-gen/expected-stdout.txt

test/968-default-partial-compile-gen/info.txt

diff --git a/test/968-default-partial-compile-gen/info.txt b/test/968-default-partial-compile-gen/info.txt
index bc1c428..e4bd5a7 100644
--- a/test/968-default-partial-compile-gen/info.txt
+++ b/test/968-default-partial-compile-gen/info.txt
@@ -13,5 +13,5 @@
 return equivalent output when run multiple times and the expected output should
 be valid.
 
-Do not modify the expected.txt file. It is generated on each run by
+Do not modify the expected-stdout.txt file. It is generated on each run by
 util-src/generate_smali.py.

test/969-iface-super/expected-stdout.txt

diff --git a/test/969-iface-super/expected.txt b/test/969-iface-super/expected-stdout.txt
similarity index 100%
rename from test/969-iface-super/expected.txt
rename to test/969-iface-super/expected-stdout.txt

test/970-iface-super-resolution-gen/build

diff --git a/test/970-iface-super-resolution-gen/build b/test/970-iface-super-resolution-gen/build
index 0594501..6eecd71 100755
--- a/test/970-iface-super-resolution-gen/build
+++ b/test/970-iface-super-resolution-gen/build
@@ -23,11 +23,11 @@
   # Build the Java files
   mkdir -p src
   mkdir -p src2
-  ./util-src/generate_java.py ./src2 ./src ./expected.txt
+  ./util-src/generate_java.py ./src2 ./src ./expected-stdout.txt
 else
-  # Generate the smali files and expected.txt or fail
+  # Generate the smali files and expected-stdout.txt or fail
   mkdir -p smali
-  ./util-src/generate_smali.py ./smali ./expected.txt
+  ./util-src/generate_smali.py ./smali ./expected-stdout.txt
 fi
 
 ./default-build "$@" --experimental default-methods

test/970-iface-super-resolution-gen/expected-stdout.txt

diff --git a/test/970-iface-super-resolution-gen/expected.txt b/test/970-iface-super-resolution-gen/expected-stdout.txt
similarity index 100%
rename from test/970-iface-super-resolution-gen/expected.txt
rename to test/970-iface-super-resolution-gen/expected-stdout.txt

test/970-iface-super-resolution-gen/info.txt

diff --git a/test/970-iface-super-resolution-gen/info.txt b/test/970-iface-super-resolution-gen/info.txt
index 2cd2cc7..b5a04fd 100644
--- a/test/970-iface-super-resolution-gen/info.txt
+++ b/test/970-iface-super-resolution-gen/info.txt
@@ -13,5 +13,5 @@
 return equivalent output when run multiple times and the expected output should
 be valid.
 
-Do not modify the expected.txt file. It is generated on each run by
+Do not modify the expected-stdout.txt file. It is generated on each run by
 util-src/generate_smali.py.

test/971-iface-super/build

diff --git a/test/971-iface-super/build b/test/971-iface-super/build
index c8f0384..38e84a5 100755
--- a/test/971-iface-super/build
+++ b/test/971-iface-super/build
@@ -23,14 +23,14 @@
   mkdir -p src
   echo "${JAVAC} \$@" >> ./javac_exec.sh
   # This will use java_exec.sh to execute the javac compiler. It will place the
-  # compiled class files in ./classes and the expected values in expected.txt
+  # compiled class files in ./classes and the expected values in expected-stdout.txt
   #
   # After this the src directory will contain the final versions of all files.
-  ./util-src/generate_java.py ./javac_exec.sh ./src ./classes ./expected.txt ./build_log
+  ./util-src/generate_java.py ./javac_exec.sh ./src ./classes ./expected-stdout.txt ./build_log
 else
   mkdir -p ./smali
-  # Generate the smali files and expected.txt or fail
-  ./util-src/generate_smali.py ./smali ./expected.txt
+  # Generate the smali files and expected-stdout.txt or fail
+  ./util-src/generate_smali.py ./smali ./expected-stdout.txt
   # Use the default build script
   ./default-build "$@" "$EXTRA_ARGS" --experimental default-methods
 fi

test/971-iface-super/expected-stdout.txt

diff --git a/test/971-iface-super/expected.txt b/test/971-iface-super/expected-stdout.txt
similarity index 100%
rename from test/971-iface-super/expected.txt
rename to test/971-iface-super/expected-stdout.txt

test/971-iface-super/info.txt

diff --git a/test/971-iface-super/info.txt b/test/971-iface-super/info.txt
index bc1c428..e4bd5a7 100644
--- a/test/971-iface-super/info.txt
+++ b/test/971-iface-super/info.txt
@@ -13,5 +13,5 @@
 return equivalent output when run multiple times and the expected output should
 be valid.
 
-Do not modify the expected.txt file. It is generated on each run by
+Do not modify the expected-stdout.txt file. It is generated on each run by
 util-src/generate_smali.py.

test/972-default-imt-collision/expected-stdout.txt

diff --git a/test/972-default-imt-collision/expected.txt b/test/972-default-imt-collision/expected-stdout.txt
similarity index 100%
rename from test/972-default-imt-collision/expected.txt
rename to test/972-default-imt-collision/expected-stdout.txt

test/972-iface-super-multidex/expected-stdout.txt

diff --git a/test/972-iface-super-multidex/expected.txt b/test/972-iface-super-multidex/expected-stdout.txt
similarity index 100%
rename from test/972-iface-super-multidex/expected.txt
rename to test/972-iface-super-multidex/expected-stdout.txt

test/973-default-multidex/expected-stdout.txt

diff --git a/test/973-default-multidex/expected.txt b/test/973-default-multidex/expected-stdout.txt
similarity index 100%
rename from test/973-default-multidex/expected.txt
rename to test/973-default-multidex/expected-stdout.txt

test/974-verify-interface-super/expected-stdout.txt

diff --git a/test/974-verify-interface-super/expected.txt b/test/974-verify-interface-super/expected-stdout.txt
similarity index 100%
rename from test/974-verify-interface-super/expected.txt
rename to test/974-verify-interface-super/expected-stdout.txt

test/975-iface-private/expected-stdout.txt

diff --git a/test/975-iface-private/expected.txt b/test/975-iface-private/expected-stdout.txt
similarity index 100%
rename from test/975-iface-private/expected.txt
rename to test/975-iface-private/expected-stdout.txt

test/976-conflict-no-methods/expected-stdout.txt

diff --git a/test/976-conflict-no-methods/expected.txt b/test/976-conflict-no-methods/expected-stdout.txt
similarity index 100%
rename from test/976-conflict-no-methods/expected.txt
rename to test/976-conflict-no-methods/expected-stdout.txt

test/978-virtual-interface/expected-stdout.txt

diff --git a/test/978-virtual-interface/expected.txt b/test/978-virtual-interface/expected-stdout.txt
similarity index 100%
rename from test/978-virtual-interface/expected.txt
rename to test/978-virtual-interface/expected-stdout.txt

test/979-const-method-handle/expected-stdout.txt

diff --git a/test/979-const-method-handle/expected.txt b/test/979-const-method-handle/expected-stdout.txt
similarity index 100%
rename from test/979-const-method-handle/expected.txt
rename to test/979-const-method-handle/expected-stdout.txt

test/980-redefine-object/expected-stdout.txt

diff --git a/test/980-redefine-object/expected.txt b/test/980-redefine-object/expected-stdout.txt
similarity index 100%
rename from test/980-redefine-object/expected.txt
rename to test/980-redefine-object/expected-stdout.txt

test/980-redefine-object/info.txt

diff --git a/test/980-redefine-object/info.txt b/test/980-redefine-object/info.txt
index f3e01b5..187dc24 100644
--- a/test/980-redefine-object/info.txt
+++ b/test/980-redefine-object/info.txt
@@ -20,4 +20,4 @@
 
 It is also possible it could fail due to the pattern of allocations caused by
 doing string concatenation or printing changing. In this case you should simply
-update the expected.txt file.
+update the expected-stdout.txt file.

test/981-dedup-original-dex/expected-stdout.txt

diff --git a/test/981-dedup-original-dex/expected.txt b/test/981-dedup-original-dex/expected-stdout.txt
similarity index 100%
rename from test/981-dedup-original-dex/expected.txt
rename to test/981-dedup-original-dex/expected-stdout.txt

test/982-ok-no-retransform/Android.bp

diff --git a/test/982-ok-no-retransform/Android.bp b/test/982-ok-no-retransform/Android.bp
index cb1ae9a..cca926e 100644
--- a/test/982-ok-no-retransform/Android.bp
+++ b/test/982-ok-no-retransform/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-982-ok-no-retransform-expected"],
+    data: [":art-run-test-982-ok-no-retransform-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-982-ok-no-retransform-expected",
-    out: ["art-run-test-982-ok-no-retransform-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-982-ok-no-retransform-expected-stdout",
+    out: ["art-run-test-982-ok-no-retransform-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/982-ok-no-retransform/expected-stdout.txt

diff --git a/test/982-ok-no-retransform/expected.txt b/test/982-ok-no-retransform/expected-stdout.txt
similarity index 100%
rename from test/982-ok-no-retransform/expected.txt
rename to test/982-ok-no-retransform/expected-stdout.txt

test/983-source-transform-verify/Android.bp

diff --git a/test/983-source-transform-verify/Android.bp b/test/983-source-transform-verify/Android.bp
index 4572d67..02a8427 100644
--- a/test/983-source-transform-verify/Android.bp
+++ b/test/983-source-transform-verify/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-983-source-transform-verify-expected"],
+    data: [":art-run-test-983-source-transform-verify-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-983-source-transform-verify-expected",
-    out: ["art-run-test-983-source-transform-verify-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-983-source-transform-verify-expected-stdout",
+    out: ["art-run-test-983-source-transform-verify-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/983-source-transform-verify/expected-stdout.txt

diff --git a/test/983-source-transform-verify/expected.txt b/test/983-source-transform-verify/expected-stdout.txt
similarity index 100%
rename from test/983-source-transform-verify/expected.txt
rename to test/983-source-transform-verify/expected-stdout.txt

test/984-obsolete-invoke/Android.bp

diff --git a/test/984-obsolete-invoke/Android.bp b/test/984-obsolete-invoke/Android.bp
index 25d8f76..7640387 100644
--- a/test/984-obsolete-invoke/Android.bp
+++ b/test/984-obsolete-invoke/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-984-obsolete-invoke-expected"],
+    data: [":art-run-test-984-obsolete-invoke-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-984-obsolete-invoke-expected",
-    out: ["art-run-test-984-obsolete-invoke-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-984-obsolete-invoke-expected-stdout",
+    out: ["art-run-test-984-obsolete-invoke-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/984-obsolete-invoke/expected-stdout.txt

diff --git a/test/984-obsolete-invoke/expected.txt b/test/984-obsolete-invoke/expected-stdout.txt
similarity index 100%
rename from test/984-obsolete-invoke/expected.txt
rename to test/984-obsolete-invoke/expected-stdout.txt

test/985-re-obsolete/Android.bp

diff --git a/test/985-re-obsolete/Android.bp b/test/985-re-obsolete/Android.bp
index c8f73ff..cdc2480 100644
--- a/test/985-re-obsolete/Android.bp
+++ b/test/985-re-obsolete/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-985-re-obsolete-expected"],
+    data: [":art-run-test-985-re-obsolete-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-985-re-obsolete-expected",
-    out: ["art-run-test-985-re-obsolete-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-985-re-obsolete-expected-stdout",
+    out: ["art-run-test-985-re-obsolete-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/985-re-obsolete/expected-stdout.txt

diff --git a/test/985-re-obsolete/expected.txt b/test/985-re-obsolete/expected-stdout.txt
similarity index 100%
rename from test/985-re-obsolete/expected.txt
rename to test/985-re-obsolete/expected-stdout.txt

test/986-native-method-bind/Android.bp

diff --git a/test/986-native-method-bind/Android.bp b/test/986-native-method-bind/Android.bp
index b5ce544..4181983 100644
--- a/test/986-native-method-bind/Android.bp
+++ b/test/986-native-method-bind/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-986-native-method-bind-expected"],
+    data: [":art-run-test-986-native-method-bind-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-986-native-method-bind-expected",
-    out: ["art-run-test-986-native-method-bind-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-986-native-method-bind-expected-stdout",
+    out: ["art-run-test-986-native-method-bind-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/986-native-method-bind/expected-stdout.txt

diff --git a/test/986-native-method-bind/expected.txt b/test/986-native-method-bind/expected-stdout.txt
similarity index 100%
rename from test/986-native-method-bind/expected.txt
rename to test/986-native-method-bind/expected-stdout.txt

test/987-agent-bind/Android.bp

diff --git a/test/987-agent-bind/Android.bp b/test/987-agent-bind/Android.bp
index 4488847..914a1a7 100644
--- a/test/987-agent-bind/Android.bp
+++ b/test/987-agent-bind/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-987-agent-bind-expected"],
+    data: [":art-run-test-987-agent-bind-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-987-agent-bind-expected",
-    out: ["art-run-test-987-agent-bind-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-987-agent-bind-expected-stdout",
+    out: ["art-run-test-987-agent-bind-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/987-agent-bind/expected-stdout.txt

diff --git a/test/987-agent-bind/expected.txt b/test/987-agent-bind/expected-stdout.txt
similarity index 100%
rename from test/987-agent-bind/expected.txt
rename to test/987-agent-bind/expected-stdout.txt

test/988-method-trace/Android.bp

diff --git a/test/988-method-trace/Android.bp b/test/988-method-trace/Android.bp
index bec9837..ed4fc59 100644
--- a/test/988-method-trace/Android.bp
+++ b/test/988-method-trace/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-988-method-trace-expected"],
+    data: [":art-run-test-988-method-trace-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-988-method-trace-expected",
-    out: ["art-run-test-988-method-trace-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-988-method-trace-expected-stdout",
+    out: ["art-run-test-988-method-trace-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/988-method-trace/expected-stdout.txt

diff --git a/test/988-method-trace/expected.txt b/test/988-method-trace/expected-stdout.txt
similarity index 100%
rename from test/988-method-trace/expected.txt
rename to test/988-method-trace/expected-stdout.txt

test/989-method-trace-throw/Android.bp

diff --git a/test/989-method-trace-throw/Android.bp b/test/989-method-trace-throw/Android.bp
index 3cf8e35..30a37b6 100644
--- a/test/989-method-trace-throw/Android.bp
+++ b/test/989-method-trace-throw/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-989-method-trace-throw-expected"],
+    data: [":art-run-test-989-method-trace-throw-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-989-method-trace-throw-expected",
-    out: ["art-run-test-989-method-trace-throw-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-989-method-trace-throw-expected-stdout",
+    out: ["art-run-test-989-method-trace-throw-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/989-method-trace-throw/expected-stdout.txt

diff --git a/test/989-method-trace-throw/expected.txt b/test/989-method-trace-throw/expected-stdout.txt
similarity index 100%
rename from test/989-method-trace-throw/expected.txt
rename to test/989-method-trace-throw/expected-stdout.txt

test/990-field-trace/Android.bp

diff --git a/test/990-field-trace/Android.bp b/test/990-field-trace/Android.bp
index 929f43d..83ce7db 100644
--- a/test/990-field-trace/Android.bp
+++ b/test/990-field-trace/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-990-field-trace-expected"],
+    data: [":art-run-test-990-field-trace-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-990-field-trace-expected",
-    out: ["art-run-test-990-field-trace-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-990-field-trace-expected-stdout",
+    out: ["art-run-test-990-field-trace-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/990-field-trace/expected-stdout.txt

diff --git a/test/990-field-trace/expected.txt b/test/990-field-trace/expected-stdout.txt
similarity index 100%
rename from test/990-field-trace/expected.txt
rename to test/990-field-trace/expected-stdout.txt

test/991-field-trace-2/Android.bp

diff --git a/test/991-field-trace-2/Android.bp b/test/991-field-trace-2/Android.bp
index 00216f3..e5e8e10 100644
--- a/test/991-field-trace-2/Android.bp
+++ b/test/991-field-trace-2/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-991-field-trace-2-expected"],
+    data: [":art-run-test-991-field-trace-2-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-991-field-trace-2-expected",
-    out: ["art-run-test-991-field-trace-2-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-991-field-trace-2-expected-stdout",
+    out: ["art-run-test-991-field-trace-2-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/991-field-trace-2/expected-stdout.txt

diff --git a/test/991-field-trace-2/expected.txt b/test/991-field-trace-2/expected-stdout.txt
similarity index 100%
rename from test/991-field-trace-2/expected.txt
rename to test/991-field-trace-2/expected-stdout.txt

test/992-source-data/Android.bp

diff --git a/test/992-source-data/Android.bp b/test/992-source-data/Android.bp
index 8b27e34..a0cbac5 100644
--- a/test/992-source-data/Android.bp
+++ b/test/992-source-data/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-992-source-data-expected"],
+    data: [":art-run-test-992-source-data-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-992-source-data-expected",
-    out: ["art-run-test-992-source-data-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-992-source-data-expected-stdout",
+    out: ["art-run-test-992-source-data-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/992-source-data/expected-stdout.txt

diff --git a/test/992-source-data/expected.txt b/test/992-source-data/expected-stdout.txt
similarity index 100%
rename from test/992-source-data/expected.txt
rename to test/992-source-data/expected-stdout.txt

test/993-breakpoints/Android.bp

diff --git a/test/993-breakpoints/Android.bp b/test/993-breakpoints/Android.bp
index e65f960..125f31f 100644
--- a/test/993-breakpoints/Android.bp
+++ b/test/993-breakpoints/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-993-breakpoints-expected"],
+    data: [":art-run-test-993-breakpoints-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-993-breakpoints-expected",
-    out: ["art-run-test-993-breakpoints-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-993-breakpoints-expected-stdout",
+    out: ["art-run-test-993-breakpoints-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/993-breakpoints/expected-stdout.txt

diff --git a/test/993-breakpoints/expected.txt b/test/993-breakpoints/expected-stdout.txt
similarity index 100%
rename from test/993-breakpoints/expected.txt
rename to test/993-breakpoints/expected-stdout.txt

test/994-breakpoint-line/Android.bp

diff --git a/test/994-breakpoint-line/Android.bp b/test/994-breakpoint-line/Android.bp
index c1dc98d..707e4a9 100644
--- a/test/994-breakpoint-line/Android.bp
+++ b/test/994-breakpoint-line/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-994-breakpoint-line-expected"],
+    data: [":art-run-test-994-breakpoint-line-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-994-breakpoint-line-expected",
-    out: ["art-run-test-994-breakpoint-line-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-994-breakpoint-line-expected-stdout",
+    out: ["art-run-test-994-breakpoint-line-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/994-breakpoint-line/expected-stdout.txt

diff --git a/test/994-breakpoint-line/expected.txt b/test/994-breakpoint-line/expected-stdout.txt
similarity index 100%
rename from test/994-breakpoint-line/expected.txt
rename to test/994-breakpoint-line/expected-stdout.txt

test/995-breakpoints-throw/Android.bp

diff --git a/test/995-breakpoints-throw/Android.bp b/test/995-breakpoints-throw/Android.bp
index 001847c..54d2646 100644
--- a/test/995-breakpoints-throw/Android.bp
+++ b/test/995-breakpoints-throw/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-995-breakpoints-throw-expected"],
+    data: [":art-run-test-995-breakpoints-throw-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-995-breakpoints-throw-expected",
-    out: ["art-run-test-995-breakpoints-throw-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-995-breakpoints-throw-expected-stdout",
+    out: ["art-run-test-995-breakpoints-throw-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/995-breakpoints-throw/expected-stdout.txt

diff --git a/test/995-breakpoints-throw/expected.txt b/test/995-breakpoints-throw/expected-stdout.txt
similarity index 100%
rename from test/995-breakpoints-throw/expected.txt
rename to test/995-breakpoints-throw/expected-stdout.txt

test/996-breakpoint-obsolete/Android.bp

diff --git a/test/996-breakpoint-obsolete/Android.bp b/test/996-breakpoint-obsolete/Android.bp
index da4ae0f..52a69ee 100644
--- a/test/996-breakpoint-obsolete/Android.bp
+++ b/test/996-breakpoint-obsolete/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-996-breakpoint-obsolete-expected"],
+    data: [":art-run-test-996-breakpoint-obsolete-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-996-breakpoint-obsolete-expected",
-    out: ["art-run-test-996-breakpoint-obsolete-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-996-breakpoint-obsolete-expected-stdout",
+    out: ["art-run-test-996-breakpoint-obsolete-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/996-breakpoint-obsolete/expected-stdout.txt

diff --git a/test/996-breakpoint-obsolete/expected.txt b/test/996-breakpoint-obsolete/expected-stdout.txt
similarity index 100%
rename from test/996-breakpoint-obsolete/expected.txt
rename to test/996-breakpoint-obsolete/expected-stdout.txt

test/997-single-step/Android.bp

diff --git a/test/997-single-step/Android.bp b/test/997-single-step/Android.bp
index 7eef9b9..9cca0fb 100644
--- a/test/997-single-step/Android.bp
+++ b/test/997-single-step/Android.bp
@@ -8,13 +8,13 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":art-run-test-target-no-test-suite-tag-template",
     srcs: ["src/**/*.java"],
-    data: [":art-run-test-997-single-step-expected"],
+    data: [":art-run-test-997-single-step-expected-stdout"],
 }
 
 // Test's expected output.
 genrule {
-    name: "art-run-test-997-single-step-expected",
-    out: ["art-run-test-997-single-step-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "art-run-test-997-single-step-expected-stdout",
+    out: ["art-run-test-997-single-step-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f $(in) $(out)",
 }

test/997-single-step/expected-stdout.txt

diff --git a/test/997-single-step/expected.txt b/test/997-single-step/expected-stdout.txt
similarity index 100%
rename from test/997-single-step/expected.txt
rename to test/997-single-step/expected-stdout.txt

test/998-redefine-use-after-free/expected-stdout.txt

diff --git a/test/998-redefine-use-after-free/expected.txt b/test/998-redefine-use-after-free/expected-stdout.txt
similarity index 100%
rename from test/998-redefine-use-after-free/expected.txt
rename to test/998-redefine-use-after-free/expected-stdout.txt

test/999-redefine-hiddenapi/expected-stdout.txt

diff --git a/test/999-redefine-hiddenapi/expected.txt b/test/999-redefine-hiddenapi/expected-stdout.txt
similarity index 100%
rename from test/999-redefine-hiddenapi/expected.txt
rename to test/999-redefine-hiddenapi/expected-stdout.txt

test/Android.bp

diff --git a/test/Android.bp b/test/Android.bp
index 1ee5164..dc12589 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -837,138 +837,138 @@
 
 // CTS test runner in cts/hostsidetests/jvmti looks for an expected test
 // result for the test NN in the file results.NN.expected.txt while in the
-// source tree each expected test result is in the NN-xxxx/expected.txt.
+// source tree each expected test result is in the NN-xxxx/expected-stdout.txt.
 // Copy+rename them them to a temporary directory and them zip them.
 java_genrule {
     name: "expected_cts_outputs_gen",
     srcs: [
-        "901-hello-ti-agent/expected.txt",
-        "902-hello-transformation/expected.txt",
-        "903-hello-tagging/expected.txt",
-        "904-object-allocation/expected.txt",
-        "905-object-free/expected.txt",
-        "906-iterate-heap/expected.txt",
-        "907-get-loaded-classes/expected.txt",
-        "908-gc-start-finish/expected.txt",
-        "910-methods/expected.txt",
+        "901-hello-ti-agent/expected-stdout.txt",
+        "902-hello-transformation/expected-stdout.txt",
+        "903-hello-tagging/expected-stdout.txt",
+        "904-object-allocation/expected-stdout.txt",
+        "905-object-free/expected-stdout.txt",
+        "906-iterate-heap/expected-stdout.txt",
+        "907-get-loaded-classes/expected-stdout.txt",
+        "908-gc-start-finish/expected-stdout.txt",
+        "910-methods/expected-stdout.txt",
         "911-get-stack-trace/expected-cts-version.txt",
-        "912-classes/expected.txt",
-        "913-heaps/expected.txt",
-        "914-hello-obsolescence/expected.txt",
-        "915-obsolete-2/expected.txt",
-        "917-fields-transformation/expected.txt",
-        "918-fields/expected.txt",
-        "919-obsolete-fields/expected.txt",
-        "920-objects/expected.txt",
-        "922-properties/expected.txt",
-        "923-monitors/expected.txt",
-        "924-threads/expected.txt",
-        "925-threadgroups/expected.txt",
-        "926-multi-obsolescence/expected.txt",
-        "927-timers/expected.txt",
-        "928-jni-table/expected.txt",
-        "930-hello-retransform/expected.txt",
-        "931-agent-thread/expected.txt",
-        "932-transform-saves/expected.txt",
-        "933-misc-events/expected.txt",
-        "940-recursive-obsolete/expected.txt",
-        "942-private-recursive/expected.txt",
-        "944-transform-classloaders/expected.txt",
-        "945-obsolete-native/expected.txt",
-        "947-reflect-method/expected.txt",
-        "951-threaded-obsolete/expected.txt",
-        "982-ok-no-retransform/expected.txt",
-        "983-source-transform-verify/expected.txt",
-        "984-obsolete-invoke/expected.txt",
-        "985-re-obsolete/expected.txt",
-        "986-native-method-bind/expected.txt",
-        "988-method-trace/expected.txt",
-        "989-method-trace-throw/expected.txt",
-        "990-field-trace/expected.txt",
-        "991-field-trace-2/expected.txt",
-        "992-source-data/expected.txt",
-        "993-breakpoints/expected.txt",
-        "994-breakpoint-line/expected.txt",
-        "995-breakpoints-throw/expected.txt",
-        "996-breakpoint-obsolete/expected.txt",
-        "997-single-step/expected.txt",
-        "1900-track-alloc/expected.txt",
-        "1901-get-bytecodes/expected.txt",
-        "1902-suspend/expected.txt",
-        "1903-suspend-self/expected.txt",
-        "1904-double-suspend/expected.txt",
-        "1906-suspend-list-me-first/expected.txt",
-        "1907-suspend-list-self-twice/expected.txt",
-        "1908-suspend-native-resume-self/expected.txt",
-        "1909-per-agent-tls/expected.txt",
-        "1910-transform-with-default/expected.txt",
-        "1911-get-local-var-table/expected.txt",
-        "1912-get-set-local-primitive/expected.txt",
-        "1913-get-set-local-objects/expected.txt",
-        "1914-get-local-instance/expected.txt",
-        "1915-get-set-local-current-thread/expected.txt",
-        "1916-get-set-current-frame/expected.txt",
-        "1917-get-stack-frame/expected.txt",
-        "1920-suspend-native-monitor/expected.txt",
-        "1921-suspend-native-recursive-monitor/expected.txt",
-        "1922-owned-monitors-info/expected.txt",
-        "1923-frame-pop/expected.txt",
-        "1924-frame-pop-toggle/expected.txt",
-        "1925-self-frame-pop/expected.txt",
-        "1926-missed-frame-pop/expected.txt",
-        "1927-exception-event/expected.txt",
-        "1928-exception-event-exception/expected.txt",
-        "1930-monitor-info/expected.txt",
-        "1931-monitor-events/expected.txt",
-        "1932-monitor-events-misc/expected.txt",
-        "1933-monitor-current-contended/expected.txt",
-        "1934-jvmti-signal-thread/expected.txt",
-        "1936-thread-end-events/expected.txt",
-        "1937-transform-soft-fail/expected.txt",
-        "1939-proxy-frames/expected.txt",
-        "1941-dispose-stress/expected.txt",
-        "1942-suspend-raw-monitor-exit/expected.txt",
-        "1943-suspend-raw-monitor-wait/expected.txt",
-        "1953-pop-frame/expected.txt",
-        "1958-transform-try-jit/expected.txt",
-        "1962-multi-thread-events/expected.txt",
-        "1963-add-to-dex-classloader-in-memory/expected.txt",
-        "1967-get-set-local-bad-slot/expected.txt",
-        "1968-force-early-return/expected.txt",
-        "1969-force-early-return-void/expected.txt",
-        "1970-force-early-return-long/expected.txt",
-        "1971-multi-force-early-return/expected.txt",
-        "1974-resize-array/expected.txt",
-        "1975-hello-structural-transformation/expected.txt",
-        "1976-hello-structural-static-methods/expected.txt",
-        "1977-hello-structural-obsolescence/expected.txt",
-        "1978-regular-obsolete-then-structural-obsolescence/expected.txt",
-        "1979-threaded-structural-transformation/expected.txt",
+        "912-classes/expected-stdout.txt",
+        "913-heaps/expected-stdout.txt",
+        "914-hello-obsolescence/expected-stdout.txt",
+        "915-obsolete-2/expected-stdout.txt",
+        "917-fields-transformation/expected-stdout.txt",
+        "918-fields/expected-stdout.txt",
+        "919-obsolete-fields/expected-stdout.txt",
+        "920-objects/expected-stdout.txt",
+        "922-properties/expected-stdout.txt",
+        "923-monitors/expected-stdout.txt",
+        "924-threads/expected-stdout.txt",
+        "925-threadgroups/expected-stdout.txt",
+        "926-multi-obsolescence/expected-stdout.txt",
+        "927-timers/expected-stdout.txt",
+        "928-jni-table/expected-stdout.txt",
+        "930-hello-retransform/expected-stdout.txt",
+        "931-agent-thread/expected-stdout.txt",
+        "932-transform-saves/expected-stdout.txt",
+        "933-misc-events/expected-stdout.txt",
+        "940-recursive-obsolete/expected-stdout.txt",
+        "942-private-recursive/expected-stdout.txt",
+        "944-transform-classloaders/expected-stdout.txt",
+        "945-obsolete-native/expected-stdout.txt",
+        "947-reflect-method/expected-stdout.txt",
+        "951-threaded-obsolete/expected-stdout.txt",
+        "982-ok-no-retransform/expected-stdout.txt",
+        "983-source-transform-verify/expected-stdout.txt",
+        "984-obsolete-invoke/expected-stdout.txt",
+        "985-re-obsolete/expected-stdout.txt",
+        "986-native-method-bind/expected-stdout.txt",
+        "988-method-trace/expected-stdout.txt",
+        "989-method-trace-throw/expected-stdout.txt",
+        "990-field-trace/expected-stdout.txt",
+        "991-field-trace-2/expected-stdout.txt",
+        "992-source-data/expected-stdout.txt",
+        "993-breakpoints/expected-stdout.txt",
+        "994-breakpoint-line/expected-stdout.txt",
+        "995-breakpoints-throw/expected-stdout.txt",
+        "996-breakpoint-obsolete/expected-stdout.txt",
+        "997-single-step/expected-stdout.txt",
+        "1900-track-alloc/expected-stdout.txt",
+        "1901-get-bytecodes/expected-stdout.txt",
+        "1902-suspend/expected-stdout.txt",
+        "1903-suspend-self/expected-stdout.txt",
+        "1904-double-suspend/expected-stdout.txt",
+        "1906-suspend-list-me-first/expected-stdout.txt",
+        "1907-suspend-list-self-twice/expected-stdout.txt",
+        "1908-suspend-native-resume-self/expected-stdout.txt",
+        "1909-per-agent-tls/expected-stdout.txt",
+        "1910-transform-with-default/expected-stdout.txt",
+        "1911-get-local-var-table/expected-stdout.txt",
+        "1912-get-set-local-primitive/expected-stdout.txt",
+        "1913-get-set-local-objects/expected-stdout.txt",
+        "1914-get-local-instance/expected-stdout.txt",
+        "1915-get-set-local-current-thread/expected-stdout.txt",
+        "1916-get-set-current-frame/expected-stdout.txt",
+        "1917-get-stack-frame/expected-stdout.txt",
+        "1920-suspend-native-monitor/expected-stdout.txt",
+        "1921-suspend-native-recursive-monitor/expected-stdout.txt",
+        "1922-owned-monitors-info/expected-stdout.txt",
+        "1923-frame-pop/expected-stdout.txt",
+        "1924-frame-pop-toggle/expected-stdout.txt",
+        "1925-self-frame-pop/expected-stdout.txt",
+        "1926-missed-frame-pop/expected-stdout.txt",
+        "1927-exception-event/expected-stdout.txt",
+        "1928-exception-event-exception/expected-stdout.txt",
+        "1930-monitor-info/expected-stdout.txt",
+        "1931-monitor-events/expected-stdout.txt",
+        "1932-monitor-events-misc/expected-stdout.txt",
+        "1933-monitor-current-contended/expected-stdout.txt",
+        "1934-jvmti-signal-thread/expected-stdout.txt",
+        "1936-thread-end-events/expected-stdout.txt",
+        "1937-transform-soft-fail/expected-stdout.txt",
+        "1939-proxy-frames/expected-stdout.txt",
+        "1941-dispose-stress/expected-stdout.txt",
+        "1942-suspend-raw-monitor-exit/expected-stdout.txt",
+        "1943-suspend-raw-monitor-wait/expected-stdout.txt",
+        "1953-pop-frame/expected-stdout.txt",
+        "1958-transform-try-jit/expected-stdout.txt",
+        "1962-multi-thread-events/expected-stdout.txt",
+        "1963-add-to-dex-classloader-in-memory/expected-stdout.txt",
+        "1967-get-set-local-bad-slot/expected-stdout.txt",
+        "1968-force-early-return/expected-stdout.txt",
+        "1969-force-early-return-void/expected-stdout.txt",
+        "1970-force-early-return-long/expected-stdout.txt",
+        "1971-multi-force-early-return/expected-stdout.txt",
+        "1974-resize-array/expected-stdout.txt",
+        "1975-hello-structural-transformation/expected-stdout.txt",
+        "1976-hello-structural-static-methods/expected-stdout.txt",
+        "1977-hello-structural-obsolescence/expected-stdout.txt",
+        "1978-regular-obsolete-then-structural-obsolescence/expected-stdout.txt",
+        "1979-threaded-structural-transformation/expected-stdout.txt",
         // TODO Requires VarHandles to be un-@hide. See b/64382372
-        // "test/1981-structural-redef-private-method-handles/expected.txt",
+        // "test/1981-structural-redef-private-method-handles/expected-stdout.txt",
         "1981-structural-redef-private-method-handles/expected_no_mh.txt",
-        "1982-no-virtuals-structural-redefinition/expected.txt",
+        "1982-no-virtuals-structural-redefinition/expected-stdout.txt",
         // JNI-id use can change the outcome of this test on device.
         "1983-structural-redefinition-failures/expected-cts.txt",
-        "1984-structural-redefine-field-trace/expected.txt",
-        "1988-multi-structural-redefine/expected.txt",
-        "1989-transform-bad-monitor/expected.txt",
-        "1990-structural-bad-verify/expected.txt",
-        "1991-hello-structural-retransform/expected.txt",
-        "1992-retransform-no-such-field/expected.txt",
-        "1994-final-virtual-structural/expected.txt",
-        "1995-final-virtual-structural-multithread/expected.txt",
-        "1996-final-override-virtual-structural/expected.txt",
-        "1997-structural-shadow-method/expected.txt",
-        "1998-structural-shadow-field/expected.txt",
-        "1999-virtual-structural/expected.txt",
-        "2001-virtual-structural-multithread/expected.txt",
-        "2002-virtual-structural-initializing/expected.txt",
-        "2003-double-virtual-structural/expected.txt",
-        "2004-double-virtual-structural-abstract/expected.txt",
-        "2005-pause-all-redefine-multithreaded/expected.txt",
-        "2006-virtual-structural-finalizing/expected.txt",
-        "2007-virtual-structural-finalizable/expected.txt",
+        "1984-structural-redefine-field-trace/expected-stdout.txt",
+        "1988-multi-structural-redefine/expected-stdout.txt",
+        "1989-transform-bad-monitor/expected-stdout.txt",
+        "1990-structural-bad-verify/expected-stdout.txt",
+        "1991-hello-structural-retransform/expected-stdout.txt",
+        "1992-retransform-no-such-field/expected-stdout.txt",
+        "1994-final-virtual-structural/expected-stdout.txt",
+        "1995-final-virtual-structural-multithread/expected-stdout.txt",
+        "1996-final-override-virtual-structural/expected-stdout.txt",
+        "1997-structural-shadow-method/expected-stdout.txt",
+        "1998-structural-shadow-field/expected-stdout.txt",
+        "1999-virtual-structural/expected-stdout.txt",
+        "2001-virtual-structural-multithread/expected-stdout.txt",
+        "2002-virtual-structural-initializing/expected-stdout.txt",
+        "2003-double-virtual-structural/expected-stdout.txt",
+        "2004-double-virtual-structural-abstract/expected-stdout.txt",
+        "2005-pause-all-redefine-multithreaded/expected-stdout.txt",
+        "2006-virtual-structural-finalizing/expected-stdout.txt",
+        "2007-virtual-structural-finalizable/expected-stdout.txt",
     ],
     out: ["expected_cts_outputs.jar"],
     tools: ["soong_zip"],

test/README.md

diff --git a/test/README.md b/test/README.md
index c7e5a3f..35a82a2 100644
--- a/test/README.md
+++ b/test/README.md
@@ -40,8 +40,8 @@
 
 After the execution of a run-test, the check step's default behavior
 (implemented in `test/etc/default-check`) is to compare its standard output with
-the contents of the `expected.txt` file contained in the test's directory; any
-mismatch triggers a test failure.
+the contents of the `expected-stdout.txt` file contained in the test's directory;
+any mismatch triggers a test failure.
 
 The `test/run-test` script handles the execution of a single run-test in a given
 configuration. The Python script `test/testrunner/testrunner.py` is a convenient

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 487958f..c76487e 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -1370,7 +1370,7 @@
         echo 'STDERR=$(mktemp)' >> ${DEX_LOCATION}/runit.sh
         echo 'STDOUT=$(mktemp)' >> ${DEX_LOCATION}/runit.sh
         echo $cmdline '2>${STDERR} >${STDOUT}' >> ${DEX_LOCATION}/runit.sh
-        echo 'if diff ${STDOUT} $ANDROID_DATA/expected.txt; then' >> ${DEX_LOCATION}/runit.sh
+        echo 'if diff ${STDOUT} $ANDROID_DATA/expected-stdout.txt; then' >> ${DEX_LOCATION}/runit.sh
         echo '  rm -f ${STDOUT} ${STDERR}' >> ${DEX_LOCATION}/runit.sh
         echo '  exit 0' >> ${DEX_LOCATION}/runit.sh
         echo 'else' >> ${DEX_LOCATION}/runit.sh

test/run-test

diff --git a/test/run-test b/test/run-test
index 83897c5..e51d9f8 100755
--- a/test/run-test
+++ b/test/run-test
@@ -122,7 +122,7 @@
 info="info.txt"
 build="build"
 run="run"
-expected="expected.txt"
+expected="expected-stdout.txt"
 check_cmd="check"
 output="output.txt"
 build_output="build-output.txt"
@@ -764,7 +764,7 @@
         echo "              The script will only run the test portion, and " \
              "share oat and dex files."
         echo "  $prog --update [options] [test-name]  Update mode" \
-             "(replaces expected.txt)."
+             "(replaces expected-stdout.txt)."
         echo '  Omitting the test name or specifying "-" will use the' \
              "current directory."
         echo "  Runtime Options:"
@@ -1129,7 +1129,7 @@
         $maybe_device_mode \
         --raw-cmd="$raw_cmd" \
         --check-script="$cwd/check" \
-        --expected-output="$cwd/expected.txt" \
+        --expected-output="$cwd/expected-stdout.txt" \
         --logfile="$cwd/bisection_log.txt" \
         --timeout=${timeout:-300}
     fi

test/utils/regen-test-files

diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index 07ec968..479dde9 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -373,14 +373,14 @@
     defaults: ["art-run-test-defaults"],
     test_config_template: ":$test_config_template",
     srcs: ["src/**/*.java"],
-    data: [":$run_test_name-expected"],
+    data: [":$run_test_name-expected-stdout"],
 $include_src}
 
 // Test's expected output.
 genrule {
-    name: "$run_test_name-expected",
-    out: ["$run_test_name-expected.txt"],
-    srcs: ["expected.txt"],
+    name: "$run_test_name-expected-stdout",
+    out: ["$run_test_name-expected-stdout.txt"],
+    srcs: ["expected-stdout.txt"],
     cmd: "cp -f \$(in) \$(out)",
 }
 EOF