Aesthetic changes in generated ART run-test Blueprint files.

Test: Run `art/test/utils/regen-test-files` and check Blueprint files
Bug: 147814778
Change-Id: I51dc20a7c7f26df163ab2de4fb33675740728a2f
diff --git a/test/001-HelloWorld/Android.bp b/test/001-HelloWorld/Android.bp
index 7464ca1..15f4f58 100644
--- a/test/001-HelloWorld/Android.bp
+++ b/test/001-HelloWorld/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `001-HelloWorld`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-001-HelloWorld",
     defaults: ["art-run-test-defaults"],
diff --git a/test/001-Main/Android.bp b/test/001-Main/Android.bp
index 34c40b8..450e4af 100644
--- a/test/001-Main/Android.bp
+++ b/test/001-Main/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `001-Main`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-001-Main",
     defaults: ["art-run-test-defaults"],
diff --git a/test/002-sleep/Android.bp b/test/002-sleep/Android.bp
index e4ad9ed..ce16240 100644
--- a/test/002-sleep/Android.bp
+++ b/test/002-sleep/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `002-sleep`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-002-sleep",
     defaults: ["art-run-test-defaults"],
diff --git a/test/004-InterfaceTest/Android.bp b/test/004-InterfaceTest/Android.bp
index 7acff76..4ba1240 100644
--- a/test/004-InterfaceTest/Android.bp
+++ b/test/004-InterfaceTest/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `004-InterfaceTest`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-004-InterfaceTest",
     defaults: ["art-run-test-defaults"],
diff --git a/test/004-SignalTest/Android.bp b/test/004-SignalTest/Android.bp
index 9a7f9b4..ce1d171 100644
--- a/test/004-SignalTest/Android.bp
+++ b/test/004-SignalTest/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `004-SignalTest`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-004-SignalTest",
     defaults: ["art-run-test-defaults"],
diff --git a/test/004-UnsafeTest/Android.bp b/test/004-UnsafeTest/Android.bp
index 5ee28aa..af9be61 100644
--- a/test/004-UnsafeTest/Android.bp
+++ b/test/004-UnsafeTest/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `004-UnsafeTest`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-004-UnsafeTest",
     defaults: ["art-run-test-defaults"],
diff --git a/test/004-checker-UnsafeTest18/Android.bp b/test/004-checker-UnsafeTest18/Android.bp
index 377e1fb..6270840 100644
--- a/test/004-checker-UnsafeTest18/Android.bp
+++ b/test/004-checker-UnsafeTest18/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `004-checker-UnsafeTest18`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-004-checker-UnsafeTest18",
     defaults: ["art-run-test-defaults"],
diff --git a/test/006-args/Android.bp b/test/006-args/Android.bp
index 9dee882..dc56f81 100644
--- a/test/006-args/Android.bp
+++ b/test/006-args/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `006-args`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-006-args",
     defaults: ["art-run-test-defaults"],
diff --git a/test/007-count10/Android.bp b/test/007-count10/Android.bp
index c764ebe..36e15df 100644
--- a/test/007-count10/Android.bp
+++ b/test/007-count10/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `007-count10`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-007-count10",
     defaults: ["art-run-test-defaults"],
diff --git a/test/009-instanceof/Android.bp b/test/009-instanceof/Android.bp
index e48acc2..5dcfc44 100644
--- a/test/009-instanceof/Android.bp
+++ b/test/009-instanceof/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `009-instanceof`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-009-instanceof",
     defaults: ["art-run-test-defaults"],
diff --git a/test/010-instance/Android.bp b/test/010-instance/Android.bp
index 2f36a01..f7515f8 100644
--- a/test/010-instance/Android.bp
+++ b/test/010-instance/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `010-instance`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-010-instance",
     defaults: ["art-run-test-defaults"],
diff --git a/test/011-array-copy/Android.bp b/test/011-array-copy/Android.bp
index 04d82ef..b0f0b90 100644
--- a/test/011-array-copy/Android.bp
+++ b/test/011-array-copy/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `011-array-copy`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-011-array-copy",
     defaults: ["art-run-test-defaults"],
diff --git a/test/012-math/Android.bp b/test/012-math/Android.bp
index e5ecd6c..0e249b9 100644
--- a/test/012-math/Android.bp
+++ b/test/012-math/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `012-math`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-012-math",
     defaults: ["art-run-test-defaults"],
diff --git a/test/013-math2/Android.bp b/test/013-math2/Android.bp
index 3d0e1f3..ea74045 100644
--- a/test/013-math2/Android.bp
+++ b/test/013-math2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `013-math2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-013-math2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/014-math3/Android.bp b/test/014-math3/Android.bp
index 4bdac13..83624bd 100644
--- a/test/014-math3/Android.bp
+++ b/test/014-math3/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `014-math3`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-014-math3",
     defaults: ["art-run-test-defaults"],
diff --git a/test/015-switch/Android.bp b/test/015-switch/Android.bp
index 9529dee..6e66d1e 100644
--- a/test/015-switch/Android.bp
+++ b/test/015-switch/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `015-switch`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-015-switch",
     defaults: ["art-run-test-defaults"],
diff --git a/test/016-intern/Android.bp b/test/016-intern/Android.bp
index dc85ad8..ca6e73f6 100644
--- a/test/016-intern/Android.bp
+++ b/test/016-intern/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `016-intern`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-016-intern",
     defaults: ["art-run-test-defaults"],
diff --git a/test/017-float/Android.bp b/test/017-float/Android.bp
index 6002427..87e4ba8 100644
--- a/test/017-float/Android.bp
+++ b/test/017-float/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `017-float`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-017-float",
     defaults: ["art-run-test-defaults"],
diff --git a/test/018-stack-overflow/Android.bp b/test/018-stack-overflow/Android.bp
index 1394178..504bdaa 100644
--- a/test/018-stack-overflow/Android.bp
+++ b/test/018-stack-overflow/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `018-stack-overflow`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-018-stack-overflow",
     defaults: ["art-run-test-defaults"],
diff --git a/test/019-wrong-array-type/Android.bp b/test/019-wrong-array-type/Android.bp
index 02c27e1..51db2d3 100644
--- a/test/019-wrong-array-type/Android.bp
+++ b/test/019-wrong-array-type/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `019-wrong-array-type`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-019-wrong-array-type",
     defaults: ["art-run-test-defaults"],
diff --git a/test/020-string/Android.bp b/test/020-string/Android.bp
index 06dad49..e588f2f 100644
--- a/test/020-string/Android.bp
+++ b/test/020-string/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `020-string`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-020-string",
     defaults: ["art-run-test-defaults"],
diff --git a/test/021-string2/Android.bp b/test/021-string2/Android.bp
index 6ac1e7f..7a6183c 100644
--- a/test/021-string2/Android.bp
+++ b/test/021-string2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `021-string2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-021-string2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/022-interface/Android.bp b/test/022-interface/Android.bp
index 0daccd7..7655279 100644
--- a/test/022-interface/Android.bp
+++ b/test/022-interface/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `022-interface`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-022-interface",
     defaults: ["art-run-test-defaults"],
diff --git a/test/025-access-controller/Android.bp b/test/025-access-controller/Android.bp
index 292f881..b02cf03 100644
--- a/test/025-access-controller/Android.bp
+++ b/test/025-access-controller/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `025-access-controller`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-025-access-controller",
     defaults: ["art-run-test-defaults"],
diff --git a/test/026-access/Android.bp b/test/026-access/Android.bp
index 9727dc9..74153c4 100644
--- a/test/026-access/Android.bp
+++ b/test/026-access/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `026-access`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-026-access",
     defaults: ["art-run-test-defaults"],
diff --git a/test/027-arithmetic/Android.bp b/test/027-arithmetic/Android.bp
index 47b0ce2..bd16e9d 100644
--- a/test/027-arithmetic/Android.bp
+++ b/test/027-arithmetic/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `027-arithmetic`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-027-arithmetic",
     defaults: ["art-run-test-defaults"],
diff --git a/test/028-array-write/Android.bp b/test/028-array-write/Android.bp
index 0b6dd8c..1375c6e 100644
--- a/test/028-array-write/Android.bp
+++ b/test/028-array-write/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `028-array-write`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-028-array-write",
     defaults: ["art-run-test-defaults"],
diff --git a/test/029-assert/Android.bp b/test/029-assert/Android.bp
index 4bff8e8..466f134 100644
--- a/test/029-assert/Android.bp
+++ b/test/029-assert/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `029-assert`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-029-assert",
     defaults: ["art-run-test-defaults"],
diff --git a/test/030-bad-finalizer/Android.bp b/test/030-bad-finalizer/Android.bp
index e4f09d3..c91ebc3 100644
--- a/test/030-bad-finalizer/Android.bp
+++ b/test/030-bad-finalizer/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `030-bad-finalizer`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-030-bad-finalizer",
     defaults: ["art-run-test-defaults"],
diff --git a/test/033-class-init-deadlock/Android.bp b/test/033-class-init-deadlock/Android.bp
index 5c46b4a..5aae481 100644
--- a/test/033-class-init-deadlock/Android.bp
+++ b/test/033-class-init-deadlock/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `033-class-init-deadlock`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-033-class-init-deadlock",
     defaults: ["art-run-test-defaults"],
diff --git a/test/034-call-null/Android.bp b/test/034-call-null/Android.bp
index a5e2fe8..13d71a4 100644
--- a/test/034-call-null/Android.bp
+++ b/test/034-call-null/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `034-call-null`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-034-call-null",
     defaults: ["art-run-test-defaults"],
diff --git a/test/035-enum/Android.bp b/test/035-enum/Android.bp
index d5e1bd8..4041fea 100644
--- a/test/035-enum/Android.bp
+++ b/test/035-enum/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `035-enum`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-035-enum",
     defaults: ["art-run-test-defaults"],
diff --git a/test/036-finalizer/Android.bp b/test/036-finalizer/Android.bp
index d9e51c8..6e2ca7a 100644
--- a/test/036-finalizer/Android.bp
+++ b/test/036-finalizer/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `036-finalizer`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-036-finalizer",
     defaults: ["art-run-test-defaults"],
diff --git a/test/037-inherit/Android.bp b/test/037-inherit/Android.bp
index a60f9e1..fc11a8e 100644
--- a/test/037-inherit/Android.bp
+++ b/test/037-inherit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `037-inherit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-037-inherit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/038-inner-null/Android.bp b/test/038-inner-null/Android.bp
index 42fb046..3787fe0 100644
--- a/test/038-inner-null/Android.bp
+++ b/test/038-inner-null/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `038-inner-null`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-038-inner-null",
     defaults: ["art-run-test-defaults"],
diff --git a/test/039-join-main/Android.bp b/test/039-join-main/Android.bp
index be72034..a6f9df4 100644
--- a/test/039-join-main/Android.bp
+++ b/test/039-join-main/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `039-join-main`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-039-join-main",
     defaults: ["art-run-test-defaults"],
diff --git a/test/040-miranda/Android.bp b/test/040-miranda/Android.bp
index 61eec8e..ca965ab 100644
--- a/test/040-miranda/Android.bp
+++ b/test/040-miranda/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `040-miranda`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-040-miranda",
     defaults: ["art-run-test-defaults"],
diff --git a/test/041-narrowing/Android.bp b/test/041-narrowing/Android.bp
index 60b4cab..4ad0b9c 100644
--- a/test/041-narrowing/Android.bp
+++ b/test/041-narrowing/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `041-narrowing`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-041-narrowing",
     defaults: ["art-run-test-defaults"],
diff --git a/test/043-privates/Android.bp b/test/043-privates/Android.bp
index 285403d..dd5b476 100644
--- a/test/043-privates/Android.bp
+++ b/test/043-privates/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `043-privates`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-043-privates",
     defaults: ["art-run-test-defaults"],
diff --git a/test/044-proxy/Android.bp b/test/044-proxy/Android.bp
index 3bbbfa1..f241880 100644
--- a/test/044-proxy/Android.bp
+++ b/test/044-proxy/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `044-proxy`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-044-proxy",
     defaults: ["art-run-test-defaults"],
diff --git a/test/045-reflect-array/Android.bp b/test/045-reflect-array/Android.bp
index f6808ef..c10758c 100644
--- a/test/045-reflect-array/Android.bp
+++ b/test/045-reflect-array/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `045-reflect-array`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-045-reflect-array",
     defaults: ["art-run-test-defaults"],
diff --git a/test/046-reflect/Android.bp b/test/046-reflect/Android.bp
index da13205..4dcf475 100644
--- a/test/046-reflect/Android.bp
+++ b/test/046-reflect/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `046-reflect`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-046-reflect",
     defaults: ["art-run-test-defaults"],
diff --git a/test/047-returns/Android.bp b/test/047-returns/Android.bp
index f9e9ed3..f6a3312 100644
--- a/test/047-returns/Android.bp
+++ b/test/047-returns/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `047-returns`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-047-returns",
     defaults: ["art-run-test-defaults"],
diff --git a/test/048-reflect-v8/Android.bp b/test/048-reflect-v8/Android.bp
index ca81ec6..799dcfb 100644
--- a/test/048-reflect-v8/Android.bp
+++ b/test/048-reflect-v8/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `048-reflect-v8`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-048-reflect-v8",
     defaults: ["art-run-test-defaults"],
diff --git a/test/049-show-object/Android.bp b/test/049-show-object/Android.bp
index 52f1433..75bda84 100644
--- a/test/049-show-object/Android.bp
+++ b/test/049-show-object/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `049-show-object`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-049-show-object",
     defaults: ["art-run-test-defaults"],
diff --git a/test/050-sync-test/Android.bp b/test/050-sync-test/Android.bp
index d1d9fb2..6959b05 100644
--- a/test/050-sync-test/Android.bp
+++ b/test/050-sync-test/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `050-sync-test`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-050-sync-test",
     defaults: ["art-run-test-defaults"],
diff --git a/test/051-thread/Android.bp b/test/051-thread/Android.bp
index 13b4b33..f1c658c 100644
--- a/test/051-thread/Android.bp
+++ b/test/051-thread/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `051-thread`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-051-thread",
     defaults: ["art-run-test-defaults"],
diff --git a/test/052-verifier-fun/Android.bp b/test/052-verifier-fun/Android.bp
index 09753dc..8c3da44 100644
--- a/test/052-verifier-fun/Android.bp
+++ b/test/052-verifier-fun/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `052-verifier-fun`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-052-verifier-fun",
     defaults: ["art-run-test-defaults"],
diff --git a/test/053-wait-some/Android.bp b/test/053-wait-some/Android.bp
index ee5ade4..210cecb 100644
--- a/test/053-wait-some/Android.bp
+++ b/test/053-wait-some/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `053-wait-some`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-053-wait-some",
     defaults: ["art-run-test-defaults"],
diff --git a/test/054-uncaught/Android.bp b/test/054-uncaught/Android.bp
index b0d316e..e017d48 100644
--- a/test/054-uncaught/Android.bp
+++ b/test/054-uncaught/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `054-uncaught`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-054-uncaught",
     defaults: ["art-run-test-defaults"],
diff --git a/test/055-enum-performance/Android.bp b/test/055-enum-performance/Android.bp
index d27166a..57f3534 100644
--- a/test/055-enum-performance/Android.bp
+++ b/test/055-enum-performance/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `055-enum-performance`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-055-enum-performance",
     defaults: ["art-run-test-defaults"],
diff --git a/test/058-enum-order/Android.bp b/test/058-enum-order/Android.bp
index eab160e..7ee529e 100644
--- a/test/058-enum-order/Android.bp
+++ b/test/058-enum-order/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `058-enum-order`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-058-enum-order",
     defaults: ["art-run-test-defaults"],
diff --git a/test/059-finalizer-throw/Android.bp b/test/059-finalizer-throw/Android.bp
index 517c253..5bbac4b 100644
--- a/test/059-finalizer-throw/Android.bp
+++ b/test/059-finalizer-throw/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `059-finalizer-throw`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-059-finalizer-throw",
     defaults: ["art-run-test-defaults"],
diff --git a/test/061-out-of-memory/Android.bp b/test/061-out-of-memory/Android.bp
index d1a456c..9e24314 100644
--- a/test/061-out-of-memory/Android.bp
+++ b/test/061-out-of-memory/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `061-out-of-memory`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-061-out-of-memory",
     defaults: ["art-run-test-defaults"],
diff --git a/test/062-character-encodings/Android.bp b/test/062-character-encodings/Android.bp
index 9a7b2bd..413313b 100644
--- a/test/062-character-encodings/Android.bp
+++ b/test/062-character-encodings/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `062-character-encodings`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-062-character-encodings",
     defaults: ["art-run-test-defaults"],
diff --git a/test/063-process-manager/Android.bp b/test/063-process-manager/Android.bp
index 00e7dfa..5992a62 100644
--- a/test/063-process-manager/Android.bp
+++ b/test/063-process-manager/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `063-process-manager`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-063-process-manager",
     defaults: ["art-run-test-defaults"],
diff --git a/test/067-preemptive-unpark/Android.bp b/test/067-preemptive-unpark/Android.bp
index aa6a0d6..26a62f8 100644
--- a/test/067-preemptive-unpark/Android.bp
+++ b/test/067-preemptive-unpark/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `067-preemptive-unpark`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-067-preemptive-unpark",
     defaults: ["art-run-test-defaults"],
diff --git a/test/070-nio-buffer/Android.bp b/test/070-nio-buffer/Android.bp
index a149666..cc2b763 100644
--- a/test/070-nio-buffer/Android.bp
+++ b/test/070-nio-buffer/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `070-nio-buffer`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-070-nio-buffer",
     defaults: ["art-run-test-defaults"],
diff --git a/test/072-precise-gc/Android.bp b/test/072-precise-gc/Android.bp
index 810d1d8..4ea8c2b 100644
--- a/test/072-precise-gc/Android.bp
+++ b/test/072-precise-gc/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `072-precise-gc`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-072-precise-gc",
     defaults: ["art-run-test-defaults"],
diff --git a/test/072-reachability-fence/Android.bp b/test/072-reachability-fence/Android.bp
index a34ca14..f079377 100644
--- a/test/072-reachability-fence/Android.bp
+++ b/test/072-reachability-fence/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `072-reachability-fence`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-072-reachability-fence",
     defaults: ["art-run-test-defaults"],
diff --git a/test/074-gc-thrash/Android.bp b/test/074-gc-thrash/Android.bp
index 4557ea6..b6b99db 100644
--- a/test/074-gc-thrash/Android.bp
+++ b/test/074-gc-thrash/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `074-gc-thrash`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-074-gc-thrash",
     defaults: ["art-run-test-defaults"],
diff --git a/test/076-boolean-put/Android.bp b/test/076-boolean-put/Android.bp
index 078f876..5fa8baf 100644
--- a/test/076-boolean-put/Android.bp
+++ b/test/076-boolean-put/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `076-boolean-put`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-076-boolean-put",
     defaults: ["art-run-test-defaults"],
diff --git a/test/078-polymorphic-virtual/Android.bp b/test/078-polymorphic-virtual/Android.bp
index 375a966..e71ab37 100644
--- a/test/078-polymorphic-virtual/Android.bp
+++ b/test/078-polymorphic-virtual/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `078-polymorphic-virtual`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-078-polymorphic-virtual",
     defaults: ["art-run-test-defaults"],
diff --git a/test/079-phantom/Android.bp b/test/079-phantom/Android.bp
index 72d5a08..11c978b 100644
--- a/test/079-phantom/Android.bp
+++ b/test/079-phantom/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `079-phantom`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-079-phantom",
     defaults: ["art-run-test-defaults"],
diff --git a/test/080-oom-fragmentation/Android.bp b/test/080-oom-fragmentation/Android.bp
index 666f60d..c81f798 100644
--- a/test/080-oom-fragmentation/Android.bp
+++ b/test/080-oom-fragmentation/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `080-oom-fragmentation`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-080-oom-fragmentation",
     defaults: ["art-run-test-defaults"],
diff --git a/test/080-oom-throw-with-finalizer/Android.bp b/test/080-oom-throw-with-finalizer/Android.bp
index dddb2ce..7f7668e 100644
--- a/test/080-oom-throw-with-finalizer/Android.bp
+++ b/test/080-oom-throw-with-finalizer/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `080-oom-throw-with-finalizer`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-080-oom-throw-with-finalizer",
     defaults: ["art-run-test-defaults"],
diff --git a/test/080-oom-throw/Android.bp b/test/080-oom-throw/Android.bp
index d4d425e..840a49c 100644
--- a/test/080-oom-throw/Android.bp
+++ b/test/080-oom-throw/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `080-oom-throw`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-080-oom-throw",
     defaults: ["art-run-test-defaults"],
diff --git a/test/081-hot-exceptions/Android.bp b/test/081-hot-exceptions/Android.bp
index 3c77213..4d4bb04 100644
--- a/test/081-hot-exceptions/Android.bp
+++ b/test/081-hot-exceptions/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `081-hot-exceptions`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-081-hot-exceptions",
     defaults: ["art-run-test-defaults"],
diff --git a/test/082-inline-execute/Android.bp b/test/082-inline-execute/Android.bp
index d0ba35c..492bbff 100644
--- a/test/082-inline-execute/Android.bp
+++ b/test/082-inline-execute/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `082-inline-execute`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-082-inline-execute",
     defaults: ["art-run-test-defaults"],
diff --git a/test/083-compiler-regressions/Android.bp b/test/083-compiler-regressions/Android.bp
index 76e4d83..cd98573 100644
--- a/test/083-compiler-regressions/Android.bp
+++ b/test/083-compiler-regressions/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `083-compiler-regressions`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-083-compiler-regressions",
     defaults: ["art-run-test-defaults"],
diff --git a/test/084-class-init/Android.bp b/test/084-class-init/Android.bp
index 213fc51..dd89fda 100644
--- a/test/084-class-init/Android.bp
+++ b/test/084-class-init/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `084-class-init`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-084-class-init",
     defaults: ["art-run-test-defaults"],
diff --git a/test/086-null-super/Android.bp b/test/086-null-super/Android.bp
index 126fb1e..512000a 100644
--- a/test/086-null-super/Android.bp
+++ b/test/086-null-super/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `086-null-super`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-086-null-super",
     defaults: ["art-run-test-defaults"],
diff --git a/test/087-gc-after-link/Android.bp b/test/087-gc-after-link/Android.bp
index a6d4c21..02a8190 100644
--- a/test/087-gc-after-link/Android.bp
+++ b/test/087-gc-after-link/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `087-gc-after-link`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-087-gc-after-link",
     defaults: ["art-run-test-defaults"],
diff --git a/test/090-loop-formation/Android.bp b/test/090-loop-formation/Android.bp
index fb56710..7e908c7 100644
--- a/test/090-loop-formation/Android.bp
+++ b/test/090-loop-formation/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `090-loop-formation`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-090-loop-formation",
     defaults: ["art-run-test-defaults"],
diff --git a/test/092-locale/Android.bp b/test/092-locale/Android.bp
index 4e1f5fa..cc3f6f2 100644
--- a/test/092-locale/Android.bp
+++ b/test/092-locale/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `092-locale`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-092-locale",
     defaults: ["art-run-test-defaults"],
diff --git a/test/093-serialization/Android.bp b/test/093-serialization/Android.bp
index 3e753cd..83ae42a 100644
--- a/test/093-serialization/Android.bp
+++ b/test/093-serialization/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `093-serialization`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-093-serialization",
     defaults: ["art-run-test-defaults"],
diff --git a/test/094-pattern/Android.bp b/test/094-pattern/Android.bp
index 163b682..892154c 100644
--- a/test/094-pattern/Android.bp
+++ b/test/094-pattern/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `094-pattern`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-094-pattern",
     defaults: ["art-run-test-defaults"],
diff --git a/test/095-switch-MAX_INT/Android.bp b/test/095-switch-MAX_INT/Android.bp
index 160d62b..0210d4f 100644
--- a/test/095-switch-MAX_INT/Android.bp
+++ b/test/095-switch-MAX_INT/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `095-switch-MAX_INT`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-095-switch-MAX_INT",
     defaults: ["art-run-test-defaults"],
diff --git a/test/096-array-copy-concurrent-gc/Android.bp b/test/096-array-copy-concurrent-gc/Android.bp
index 814cbdd..1921041 100644
--- a/test/096-array-copy-concurrent-gc/Android.bp
+++ b/test/096-array-copy-concurrent-gc/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `096-array-copy-concurrent-gc`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-096-array-copy-concurrent-gc",
     defaults: ["art-run-test-defaults"],
diff --git a/test/098-ddmc/Android.bp b/test/098-ddmc/Android.bp
index 534cd83..6afdbb3 100644
--- a/test/098-ddmc/Android.bp
+++ b/test/098-ddmc/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `098-ddmc`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-098-ddmc",
     defaults: ["art-run-test-defaults"],
diff --git a/test/099-vmdebug/Android.bp b/test/099-vmdebug/Android.bp
index 2914f2e..b83cf96 100644
--- a/test/099-vmdebug/Android.bp
+++ b/test/099-vmdebug/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `099-vmdebug`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-099-vmdebug",
     defaults: ["art-run-test-defaults"],
diff --git a/test/100-reflect2/Android.bp b/test/100-reflect2/Android.bp
index edb7ab6..c2ed58f 100644
--- a/test/100-reflect2/Android.bp
+++ b/test/100-reflect2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `100-reflect2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-100-reflect2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1004-checker-volatile-ref-load/Android.bp b/test/1004-checker-volatile-ref-load/Android.bp
index 0999b5e..6c524d0 100644
--- a/test/1004-checker-volatile-ref-load/Android.bp
+++ b/test/1004-checker-volatile-ref-load/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1004-checker-volatile-ref-load`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1004-checker-volatile-ref-load",
     defaults: ["art-run-test-defaults"],
diff --git a/test/101-fibonacci/Android.bp b/test/101-fibonacci/Android.bp
index a5ac2fd..3a37d1f 100644
--- a/test/101-fibonacci/Android.bp
+++ b/test/101-fibonacci/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `101-fibonacci`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-101-fibonacci",
     defaults: ["art-run-test-defaults"],
diff --git a/test/102-concurrent-gc/Android.bp b/test/102-concurrent-gc/Android.bp
index 2c08015..2409aef 100644
--- a/test/102-concurrent-gc/Android.bp
+++ b/test/102-concurrent-gc/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `102-concurrent-gc`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-102-concurrent-gc",
     defaults: ["art-run-test-defaults"],
diff --git a/test/103-string-append/Android.bp b/test/103-string-append/Android.bp
index 508070c..ccef18a 100644
--- a/test/103-string-append/Android.bp
+++ b/test/103-string-append/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `103-string-append`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-103-string-append",
     defaults: ["art-run-test-defaults"],
diff --git a/test/104-growth-limit/Android.bp b/test/104-growth-limit/Android.bp
index 8a8c97c..8820472 100644
--- a/test/104-growth-limit/Android.bp
+++ b/test/104-growth-limit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `104-growth-limit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-104-growth-limit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/105-invoke/Android.bp b/test/105-invoke/Android.bp
index 8b5a8e1f..89c9bdf 100644
--- a/test/105-invoke/Android.bp
+++ b/test/105-invoke/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `105-invoke`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-105-invoke",
     defaults: ["art-run-test-defaults"],
diff --git a/test/106-exceptions2/Android.bp b/test/106-exceptions2/Android.bp
index 33c6075..e5c3427 100644
--- a/test/106-exceptions2/Android.bp
+++ b/test/106-exceptions2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `106-exceptions2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-106-exceptions2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/107-int-math2/Android.bp b/test/107-int-math2/Android.bp
index d252912..930909f 100644
--- a/test/107-int-math2/Android.bp
+++ b/test/107-int-math2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `107-int-math2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-107-int-math2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/108-check-cast/Android.bp b/test/108-check-cast/Android.bp
index 9e094e9..fa5d730 100644
--- a/test/108-check-cast/Android.bp
+++ b/test/108-check-cast/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `108-check-cast`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-108-check-cast",
     defaults: ["art-run-test-defaults"],
diff --git a/test/109-suspend-check/Android.bp b/test/109-suspend-check/Android.bp
index fb8fec7..133d965 100644
--- a/test/109-suspend-check/Android.bp
+++ b/test/109-suspend-check/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `109-suspend-check`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-109-suspend-check",
     defaults: ["art-run-test-defaults"],
diff --git a/test/110-field-access/Android.bp b/test/110-field-access/Android.bp
index d350abe..3e67fac 100644
--- a/test/110-field-access/Android.bp
+++ b/test/110-field-access/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `110-field-access`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-110-field-access",
     defaults: ["art-run-test-defaults"],
diff --git a/test/112-double-math/Android.bp b/test/112-double-math/Android.bp
index 19f60e3..2c16776 100644
--- a/test/112-double-math/Android.bp
+++ b/test/112-double-math/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `112-double-math`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-112-double-math",
     defaults: ["art-run-test-defaults"],
diff --git a/test/114-ParallelGC/Android.bp b/test/114-ParallelGC/Android.bp
index 6879c88..bae03cc 100644
--- a/test/114-ParallelGC/Android.bp
+++ b/test/114-ParallelGC/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `114-ParallelGC`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-114-ParallelGC",
     defaults: ["art-run-test-defaults"],
diff --git a/test/115-native-bridge/Android.bp b/test/115-native-bridge/Android.bp
index fbcd428..be77457 100644
--- a/test/115-native-bridge/Android.bp
+++ b/test/115-native-bridge/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `115-native-bridge`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-115-native-bridge",
     defaults: ["art-run-test-defaults"],
diff --git a/test/116-nodex2oat/Android.bp b/test/116-nodex2oat/Android.bp
index 1579588..090856b 100644
--- a/test/116-nodex2oat/Android.bp
+++ b/test/116-nodex2oat/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `116-nodex2oat`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-116-nodex2oat",
     defaults: ["art-run-test-defaults"],
diff --git a/test/120-hashcode/Android.bp b/test/120-hashcode/Android.bp
index 91049cc..453893a 100644
--- a/test/120-hashcode/Android.bp
+++ b/test/120-hashcode/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `120-hashcode`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-120-hashcode",
     defaults: ["art-run-test-defaults"],
diff --git a/test/121-simple-suspend-check/Android.bp b/test/121-simple-suspend-check/Android.bp
index c244e3d..22821fe 100644
--- a/test/121-simple-suspend-check/Android.bp
+++ b/test/121-simple-suspend-check/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `121-simple-suspend-check`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-121-simple-suspend-check",
     defaults: ["art-run-test-defaults"],
diff --git a/test/122-npe/Android.bp b/test/122-npe/Android.bp
index 5e55e00..fba593d 100644
--- a/test/122-npe/Android.bp
+++ b/test/122-npe/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `122-npe`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-122-npe",
     defaults: ["art-run-test-defaults"],
diff --git a/test/123-compiler-regressions-mt/Android.bp b/test/123-compiler-regressions-mt/Android.bp
index d111c05..7c50958 100644
--- a/test/123-compiler-regressions-mt/Android.bp
+++ b/test/123-compiler-regressions-mt/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `123-compiler-regressions-mt`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-123-compiler-regressions-mt",
     defaults: ["art-run-test-defaults"],
diff --git a/test/123-inline-execute2/Android.bp b/test/123-inline-execute2/Android.bp
index 2a9cefb..146d9c2 100644
--- a/test/123-inline-execute2/Android.bp
+++ b/test/123-inline-execute2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `123-inline-execute2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-123-inline-execute2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/125-gc-and-classloading/Android.bp b/test/125-gc-and-classloading/Android.bp
index 7693c9a..64a7a55 100644
--- a/test/125-gc-and-classloading/Android.bp
+++ b/test/125-gc-and-classloading/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `125-gc-and-classloading`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-125-gc-and-classloading",
     defaults: ["art-run-test-defaults"],
diff --git a/test/128-reg-spill-on-implicit-nullcheck/Android.bp b/test/128-reg-spill-on-implicit-nullcheck/Android.bp
index f6949ff..2dea4ad 100644
--- a/test/128-reg-spill-on-implicit-nullcheck/Android.bp
+++ b/test/128-reg-spill-on-implicit-nullcheck/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `128-reg-spill-on-implicit-nullcheck`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-128-reg-spill-on-implicit-nullcheck",
     defaults: ["art-run-test-defaults"],
diff --git a/test/129-ThreadGetId/Android.bp b/test/129-ThreadGetId/Android.bp
index 8884fa5..85f6400 100644
--- a/test/129-ThreadGetId/Android.bp
+++ b/test/129-ThreadGetId/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `129-ThreadGetId`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-129-ThreadGetId",
     defaults: ["art-run-test-defaults"],
diff --git a/test/132-daemon-locks-shutdown/Android.bp b/test/132-daemon-locks-shutdown/Android.bp
index 636d013..e442181 100644
--- a/test/132-daemon-locks-shutdown/Android.bp
+++ b/test/132-daemon-locks-shutdown/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `132-daemon-locks-shutdown`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-132-daemon-locks-shutdown",
     defaults: ["art-run-test-defaults"],
diff --git a/test/133-static-invoke-super/Android.bp b/test/133-static-invoke-super/Android.bp
index 645bd9f..5b24c4e 100644
--- a/test/133-static-invoke-super/Android.bp
+++ b/test/133-static-invoke-super/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `133-static-invoke-super`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-133-static-invoke-super",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1336-short-finalizer-timeout/Android.bp b/test/1336-short-finalizer-timeout/Android.bp
index 450d6d1..ad8e8be 100644
--- a/test/1336-short-finalizer-timeout/Android.bp
+++ b/test/1336-short-finalizer-timeout/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1336-short-finalizer-timeout`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1336-short-finalizer-timeout",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1337-gc-coverage/Android.bp b/test/1337-gc-coverage/Android.bp
index a774b2b..97cb8d0 100644
--- a/test/1337-gc-coverage/Android.bp
+++ b/test/1337-gc-coverage/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1337-gc-coverage`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1337-gc-coverage",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1339-dead-reference-safe/Android.bp b/test/1339-dead-reference-safe/Android.bp
index 0d7ef18..17beb40 100644
--- a/test/1339-dead-reference-safe/Android.bp
+++ b/test/1339-dead-reference-safe/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1339-dead-reference-safe`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1339-dead-reference-safe",
     defaults: ["art-run-test-defaults"],
diff --git a/test/136-daemon-jni-shutdown/Android.bp b/test/136-daemon-jni-shutdown/Android.bp
index e07744a..747c98e 100644
--- a/test/136-daemon-jni-shutdown/Android.bp
+++ b/test/136-daemon-jni-shutdown/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `136-daemon-jni-shutdown`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-136-daemon-jni-shutdown",
     defaults: ["art-run-test-defaults"],
diff --git a/test/139-register-natives/Android.bp b/test/139-register-natives/Android.bp
index e929b50..b80fb44 100644
--- a/test/139-register-natives/Android.bp
+++ b/test/139-register-natives/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `139-register-natives`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-139-register-natives",
     defaults: ["art-run-test-defaults"],
diff --git a/test/140-dce-regression/Android.bp b/test/140-dce-regression/Android.bp
index 8191e6a..796fe3c 100644
--- a/test/140-dce-regression/Android.bp
+++ b/test/140-dce-regression/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `140-dce-regression`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-140-dce-regression",
     defaults: ["art-run-test-defaults"],
diff --git a/test/140-field-packing/Android.bp b/test/140-field-packing/Android.bp
index d3db6ed..82ce2f97 100644
--- a/test/140-field-packing/Android.bp
+++ b/test/140-field-packing/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `140-field-packing`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-140-field-packing",
     defaults: ["art-run-test-defaults"],
diff --git a/test/143-string-value/Android.bp b/test/143-string-value/Android.bp
index 9c6d86e..86d2877 100644
--- a/test/143-string-value/Android.bp
+++ b/test/143-string-value/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `143-string-value`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-143-string-value",
     defaults: ["art-run-test-defaults"],
diff --git a/test/144-static-field-sigquit/Android.bp b/test/144-static-field-sigquit/Android.bp
index aeb80d7..0c21c07 100644
--- a/test/144-static-field-sigquit/Android.bp
+++ b/test/144-static-field-sigquit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `144-static-field-sigquit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-144-static-field-sigquit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/148-multithread-gc-annotations/Android.bp b/test/148-multithread-gc-annotations/Android.bp
index c0fa0bc..c55e8dd 100644
--- a/test/148-multithread-gc-annotations/Android.bp
+++ b/test/148-multithread-gc-annotations/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `148-multithread-gc-annotations`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-148-multithread-gc-annotations",
     defaults: ["art-run-test-defaults"],
diff --git a/test/149-suspend-all-stress/Android.bp b/test/149-suspend-all-stress/Android.bp
index 12ce27f..1960717 100644
--- a/test/149-suspend-all-stress/Android.bp
+++ b/test/149-suspend-all-stress/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `149-suspend-all-stress`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-149-suspend-all-stress",
     defaults: ["art-run-test-defaults"],
diff --git a/test/150-loadlibrary/Android.bp b/test/150-loadlibrary/Android.bp
index eccdd19..0a69263 100644
--- a/test/150-loadlibrary/Android.bp
+++ b/test/150-loadlibrary/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `150-loadlibrary`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-150-loadlibrary",
     defaults: ["art-run-test-defaults"],
diff --git a/test/151-OpenFileLimit/Android.bp b/test/151-OpenFileLimit/Android.bp
index bd12d52..946be83 100644
--- a/test/151-OpenFileLimit/Android.bp
+++ b/test/151-OpenFileLimit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `151-OpenFileLimit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-151-OpenFileLimit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/152-dead-large-object/Android.bp b/test/152-dead-large-object/Android.bp
index cdcf131..010deb8 100644
--- a/test/152-dead-large-object/Android.bp
+++ b/test/152-dead-large-object/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `152-dead-large-object`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-152-dead-large-object",
     defaults: ["art-run-test-defaults"],
diff --git a/test/153-reference-stress/Android.bp b/test/153-reference-stress/Android.bp
index 7d1b544..ec9c6e9 100644
--- a/test/153-reference-stress/Android.bp
+++ b/test/153-reference-stress/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `153-reference-stress`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-153-reference-stress",
     defaults: ["art-run-test-defaults"],
diff --git a/test/154-gc-loop/Android.bp b/test/154-gc-loop/Android.bp
index 100607f..7346c2e 100644
--- a/test/154-gc-loop/Android.bp
+++ b/test/154-gc-loop/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `154-gc-loop`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-154-gc-loop",
     defaults: ["art-run-test-defaults"],
diff --git a/test/156-register-dex-file-multi-loader/Android.bp b/test/156-register-dex-file-multi-loader/Android.bp
index 2254a8a..0f49bfe 100644
--- a/test/156-register-dex-file-multi-loader/Android.bp
+++ b/test/156-register-dex-file-multi-loader/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `156-register-dex-file-multi-loader`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-156-register-dex-file-multi-loader",
     defaults: ["art-run-test-defaults"],
diff --git a/test/158-app-image-class-table/Android.bp b/test/158-app-image-class-table/Android.bp
index 6389b08..ac34d66 100644
--- a/test/158-app-image-class-table/Android.bp
+++ b/test/158-app-image-class-table/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `158-app-image-class-table`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-158-app-image-class-table",
     defaults: ["art-run-test-defaults"],
diff --git a/test/159-app-image-fields/Android.bp b/test/159-app-image-fields/Android.bp
index adbd61d..89d35ef 100644
--- a/test/159-app-image-fields/Android.bp
+++ b/test/159-app-image-fields/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `159-app-image-fields`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-159-app-image-fields",
     defaults: ["art-run-test-defaults"],
diff --git a/test/163-app-image-methods/Android.bp b/test/163-app-image-methods/Android.bp
index 47572fb..5737662 100644
--- a/test/163-app-image-methods/Android.bp
+++ b/test/163-app-image-methods/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `163-app-image-methods`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-163-app-image-methods",
     defaults: ["art-run-test-defaults"],
diff --git a/test/165-lock-owner-proxy/Android.bp b/test/165-lock-owner-proxy/Android.bp
index 6792e39..dc30150 100644
--- a/test/165-lock-owner-proxy/Android.bp
+++ b/test/165-lock-owner-proxy/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `165-lock-owner-proxy`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-165-lock-owner-proxy",
     defaults: ["art-run-test-defaults"],
diff --git a/test/168-vmstack-annotated/Android.bp b/test/168-vmstack-annotated/Android.bp
index 8316d12..34f22d8 100644
--- a/test/168-vmstack-annotated/Android.bp
+++ b/test/168-vmstack-annotated/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `168-vmstack-annotated`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-168-vmstack-annotated",
     defaults: ["art-run-test-defaults"],
diff --git a/test/169-threadgroup-jni/Android.bp b/test/169-threadgroup-jni/Android.bp
index d8bd631..a0fb5e9 100644
--- a/test/169-threadgroup-jni/Android.bp
+++ b/test/169-threadgroup-jni/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `169-threadgroup-jni`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-169-threadgroup-jni",
     defaults: ["art-run-test-defaults"],
diff --git a/test/170-interface-init/Android.bp b/test/170-interface-init/Android.bp
index 7700c64..60d5e49 100644
--- a/test/170-interface-init/Android.bp
+++ b/test/170-interface-init/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `170-interface-init`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-170-interface-init",
     defaults: ["art-run-test-defaults"],
diff --git a/test/172-app-image-twice/Android.bp b/test/172-app-image-twice/Android.bp
index 8010829..be8d202 100644
--- a/test/172-app-image-twice/Android.bp
+++ b/test/172-app-image-twice/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `172-app-image-twice`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-172-app-image-twice",
     defaults: ["art-run-test-defaults"],
diff --git a/test/174-escaping-instance-of-bad-class/Android.bp b/test/174-escaping-instance-of-bad-class/Android.bp
index 82dd0d3..f319930 100644
--- a/test/174-escaping-instance-of-bad-class/Android.bp
+++ b/test/174-escaping-instance-of-bad-class/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `174-escaping-instance-of-bad-class`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-174-escaping-instance-of-bad-class",
     defaults: ["art-run-test-defaults"],
diff --git a/test/175-alloc-big-bignums/Android.bp b/test/175-alloc-big-bignums/Android.bp
index 9677975..20ae278 100644
--- a/test/175-alloc-big-bignums/Android.bp
+++ b/test/175-alloc-big-bignums/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `175-alloc-big-bignums`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-175-alloc-big-bignums",
     defaults: ["art-run-test-defaults"],
diff --git a/test/176-app-image-string/Android.bp b/test/176-app-image-string/Android.bp
index 4d86521..3dae355 100644
--- a/test/176-app-image-string/Android.bp
+++ b/test/176-app-image-string/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `176-app-image-string`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-176-app-image-string",
     defaults: ["art-run-test-defaults"],
diff --git a/test/177-visibly-initialized-deadlock/Android.bp b/test/177-visibly-initialized-deadlock/Android.bp
index 292ff57..2b7106b 100644
--- a/test/177-visibly-initialized-deadlock/Android.bp
+++ b/test/177-visibly-initialized-deadlock/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `177-visibly-initialized-deadlock`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-177-visibly-initialized-deadlock",
     defaults: ["art-run-test-defaults"],
diff --git a/test/178-app-image-native-method/Android.bp b/test/178-app-image-native-method/Android.bp
index 3508df5..2757eb7 100644
--- a/test/178-app-image-native-method/Android.bp
+++ b/test/178-app-image-native-method/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `178-app-image-native-method`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-178-app-image-native-method",
     defaults: ["art-run-test-defaults"],
diff --git a/test/179-nonvirtual-jni/Android.bp b/test/179-nonvirtual-jni/Android.bp
index 2644d49..4ba6a89 100644
--- a/test/179-nonvirtual-jni/Android.bp
+++ b/test/179-nonvirtual-jni/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `179-nonvirtual-jni`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-179-nonvirtual-jni",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1900-track-alloc/Android.bp b/test/1900-track-alloc/Android.bp
index 02e0e1e..bf8a29e 100644
--- a/test/1900-track-alloc/Android.bp
+++ b/test/1900-track-alloc/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1900-track-alloc`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1900-track-alloc",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1901-get-bytecodes/Android.bp b/test/1901-get-bytecodes/Android.bp
index ffa5486..b037ec6 100644
--- a/test/1901-get-bytecodes/Android.bp
+++ b/test/1901-get-bytecodes/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1901-get-bytecodes`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1901-get-bytecodes",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1902-suspend/Android.bp b/test/1902-suspend/Android.bp
index 5c36b05..960b041 100644
--- a/test/1902-suspend/Android.bp
+++ b/test/1902-suspend/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1902-suspend`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1902-suspend",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1903-suspend-self/Android.bp b/test/1903-suspend-self/Android.bp
index 574ad3f..7d677b7 100644
--- a/test/1903-suspend-self/Android.bp
+++ b/test/1903-suspend-self/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1903-suspend-self`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1903-suspend-self",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1904-double-suspend/Android.bp b/test/1904-double-suspend/Android.bp
index 6dd2f92..19c386f 100644
--- a/test/1904-double-suspend/Android.bp
+++ b/test/1904-double-suspend/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1904-double-suspend`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1904-double-suspend",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1905-suspend-native/Android.bp b/test/1905-suspend-native/Android.bp
index f5c7f00..1cd2879 100644
--- a/test/1905-suspend-native/Android.bp
+++ b/test/1905-suspend-native/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1905-suspend-native`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1905-suspend-native",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1906-suspend-list-me-first/Android.bp b/test/1906-suspend-list-me-first/Android.bp
index 92579c6..558949e 100644
--- a/test/1906-suspend-list-me-first/Android.bp
+++ b/test/1906-suspend-list-me-first/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1906-suspend-list-me-first`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1906-suspend-list-me-first",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1907-suspend-list-self-twice/Android.bp b/test/1907-suspend-list-self-twice/Android.bp
index 198f483..8afa6c7 100644
--- a/test/1907-suspend-list-self-twice/Android.bp
+++ b/test/1907-suspend-list-self-twice/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1907-suspend-list-self-twice`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1907-suspend-list-self-twice",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1908-suspend-native-resume-self/Android.bp b/test/1908-suspend-native-resume-self/Android.bp
index 38156d9..f2b97e4 100644
--- a/test/1908-suspend-native-resume-self/Android.bp
+++ b/test/1908-suspend-native-resume-self/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1908-suspend-native-resume-self`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1908-suspend-native-resume-self",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1909-per-agent-tls/Android.bp b/test/1909-per-agent-tls/Android.bp
index 1553c6d..09c61b1 100644
--- a/test/1909-per-agent-tls/Android.bp
+++ b/test/1909-per-agent-tls/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1909-per-agent-tls`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1909-per-agent-tls",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1910-transform-with-default/Android.bp b/test/1910-transform-with-default/Android.bp
index dd3cd90..469f9d1 100644
--- a/test/1910-transform-with-default/Android.bp
+++ b/test/1910-transform-with-default/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1910-transform-with-default`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1910-transform-with-default",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1911-get-local-var-table/Android.bp b/test/1911-get-local-var-table/Android.bp
index 559021c..a5c212e 100644
--- a/test/1911-get-local-var-table/Android.bp
+++ b/test/1911-get-local-var-table/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1911-get-local-var-table`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1911-get-local-var-table",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1912-get-set-local-primitive/Android.bp b/test/1912-get-set-local-primitive/Android.bp
index 249ac98..f4761e2 100644
--- a/test/1912-get-set-local-primitive/Android.bp
+++ b/test/1912-get-set-local-primitive/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1912-get-set-local-primitive`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1912-get-set-local-primitive",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1913-get-set-local-objects/Android.bp b/test/1913-get-set-local-objects/Android.bp
index eef4487..dd77c47 100644
--- a/test/1913-get-set-local-objects/Android.bp
+++ b/test/1913-get-set-local-objects/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1913-get-set-local-objects`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1913-get-set-local-objects",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1914-get-local-instance/Android.bp b/test/1914-get-local-instance/Android.bp
index 0c9e3d5..99f38545 100644
--- a/test/1914-get-local-instance/Android.bp
+++ b/test/1914-get-local-instance/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1914-get-local-instance`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1914-get-local-instance",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1915-get-set-local-current-thread/Android.bp b/test/1915-get-set-local-current-thread/Android.bp
index 6e71a5e..925ddc9 100644
--- a/test/1915-get-set-local-current-thread/Android.bp
+++ b/test/1915-get-set-local-current-thread/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1915-get-set-local-current-thread`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1915-get-set-local-current-thread",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1916-get-set-current-frame/Android.bp b/test/1916-get-set-current-frame/Android.bp
index f44a6f2..4777050 100644
--- a/test/1916-get-set-current-frame/Android.bp
+++ b/test/1916-get-set-current-frame/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1916-get-set-current-frame`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1916-get-set-current-frame",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1917-get-stack-frame/Android.bp b/test/1917-get-stack-frame/Android.bp
index f29735f..63c611352 100644
--- a/test/1917-get-stack-frame/Android.bp
+++ b/test/1917-get-stack-frame/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1917-get-stack-frame`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1917-get-stack-frame",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1919-vminit-thread-start-timing/Android.bp b/test/1919-vminit-thread-start-timing/Android.bp
index 1004f06..65748c2 100644
--- a/test/1919-vminit-thread-start-timing/Android.bp
+++ b/test/1919-vminit-thread-start-timing/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1919-vminit-thread-start-timing`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1919-vminit-thread-start-timing",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1920-suspend-native-monitor/Android.bp b/test/1920-suspend-native-monitor/Android.bp
index 556444c..a0e112e 100644
--- a/test/1920-suspend-native-monitor/Android.bp
+++ b/test/1920-suspend-native-monitor/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1920-suspend-native-monitor`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1920-suspend-native-monitor",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1921-suspend-native-recursive-monitor/Android.bp b/test/1921-suspend-native-recursive-monitor/Android.bp
index 4c7b37f..bfe3ede 100644
--- a/test/1921-suspend-native-recursive-monitor/Android.bp
+++ b/test/1921-suspend-native-recursive-monitor/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1921-suspend-native-recursive-monitor`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1921-suspend-native-recursive-monitor",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1922-owned-monitors-info/Android.bp b/test/1922-owned-monitors-info/Android.bp
index 3090fdf..c6de1d7 100644
--- a/test/1922-owned-monitors-info/Android.bp
+++ b/test/1922-owned-monitors-info/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1922-owned-monitors-info`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1922-owned-monitors-info",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1923-frame-pop/Android.bp b/test/1923-frame-pop/Android.bp
index 00336e9..397d60e 100644
--- a/test/1923-frame-pop/Android.bp
+++ b/test/1923-frame-pop/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1923-frame-pop`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1923-frame-pop",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1924-frame-pop-toggle/Android.bp b/test/1924-frame-pop-toggle/Android.bp
index 620d8a6..2ad8423 100644
--- a/test/1924-frame-pop-toggle/Android.bp
+++ b/test/1924-frame-pop-toggle/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1924-frame-pop-toggle`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1924-frame-pop-toggle",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1925-self-frame-pop/Android.bp b/test/1925-self-frame-pop/Android.bp
index bb6b67c..d3912cf 100644
--- a/test/1925-self-frame-pop/Android.bp
+++ b/test/1925-self-frame-pop/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1925-self-frame-pop`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1925-self-frame-pop",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1926-missed-frame-pop/Android.bp b/test/1926-missed-frame-pop/Android.bp
index 6d80b3a..2e08151 100644
--- a/test/1926-missed-frame-pop/Android.bp
+++ b/test/1926-missed-frame-pop/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1926-missed-frame-pop`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1926-missed-frame-pop",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1927-exception-event/Android.bp b/test/1927-exception-event/Android.bp
index 721ab84..b793ed4 100644
--- a/test/1927-exception-event/Android.bp
+++ b/test/1927-exception-event/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1927-exception-event`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1927-exception-event",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1928-exception-event-exception/Android.bp b/test/1928-exception-event-exception/Android.bp
index 7f92f25..11844b6 100644
--- a/test/1928-exception-event-exception/Android.bp
+++ b/test/1928-exception-event-exception/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1928-exception-event-exception`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1928-exception-event-exception",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1930-monitor-info/Android.bp b/test/1930-monitor-info/Android.bp
index cb9bf1d..4ee533e 100644
--- a/test/1930-monitor-info/Android.bp
+++ b/test/1930-monitor-info/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1930-monitor-info`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1930-monitor-info",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1931-monitor-events/Android.bp b/test/1931-monitor-events/Android.bp
index f2a7668..d0a25d4 100644
--- a/test/1931-monitor-events/Android.bp
+++ b/test/1931-monitor-events/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1931-monitor-events`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1931-monitor-events",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1932-monitor-events-misc/Android.bp b/test/1932-monitor-events-misc/Android.bp
index d435f1f..d8124ff 100644
--- a/test/1932-monitor-events-misc/Android.bp
+++ b/test/1932-monitor-events-misc/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1932-monitor-events-misc`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1932-monitor-events-misc",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1933-monitor-current-contended/Android.bp b/test/1933-monitor-current-contended/Android.bp
index 3f98fd3..8630325 100644
--- a/test/1933-monitor-current-contended/Android.bp
+++ b/test/1933-monitor-current-contended/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1933-monitor-current-contended`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1933-monitor-current-contended",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1934-jvmti-signal-thread/Android.bp b/test/1934-jvmti-signal-thread/Android.bp
index 2a852ad..7579834 100644
--- a/test/1934-jvmti-signal-thread/Android.bp
+++ b/test/1934-jvmti-signal-thread/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1934-jvmti-signal-thread`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1934-jvmti-signal-thread",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1935-get-set-current-frame-jit/Android.bp b/test/1935-get-set-current-frame-jit/Android.bp
index 154d8c4..0d863b9 100644
--- a/test/1935-get-set-current-frame-jit/Android.bp
+++ b/test/1935-get-set-current-frame-jit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1935-get-set-current-frame-jit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1935-get-set-current-frame-jit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1936-thread-end-events/Android.bp b/test/1936-thread-end-events/Android.bp
index d4151e3..3f29c7e 100644
--- a/test/1936-thread-end-events/Android.bp
+++ b/test/1936-thread-end-events/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1936-thread-end-events`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1936-thread-end-events",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1937-transform-soft-fail/Android.bp b/test/1937-transform-soft-fail/Android.bp
index 9baab50..b8fbc0b 100644
--- a/test/1937-transform-soft-fail/Android.bp
+++ b/test/1937-transform-soft-fail/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1937-transform-soft-fail`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1937-transform-soft-fail",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1938-transform-abstract-single-impl/Android.bp b/test/1938-transform-abstract-single-impl/Android.bp
index f58da51..e4cdf2c 100644
--- a/test/1938-transform-abstract-single-impl/Android.bp
+++ b/test/1938-transform-abstract-single-impl/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1938-transform-abstract-single-impl`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1938-transform-abstract-single-impl",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1939-proxy-frames/Android.bp b/test/1939-proxy-frames/Android.bp
index 23e4edd5..f68aa24 100644
--- a/test/1939-proxy-frames/Android.bp
+++ b/test/1939-proxy-frames/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1939-proxy-frames`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1939-proxy-frames",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1941-dispose-stress/Android.bp b/test/1941-dispose-stress/Android.bp
index 800e73d..57b604b 100644
--- a/test/1941-dispose-stress/Android.bp
+++ b/test/1941-dispose-stress/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1941-dispose-stress`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1941-dispose-stress",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1942-suspend-raw-monitor-exit/Android.bp b/test/1942-suspend-raw-monitor-exit/Android.bp
index 1ef27d9..01b8591 100644
--- a/test/1942-suspend-raw-monitor-exit/Android.bp
+++ b/test/1942-suspend-raw-monitor-exit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1942-suspend-raw-monitor-exit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1942-suspend-raw-monitor-exit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1943-suspend-raw-monitor-wait/Android.bp b/test/1943-suspend-raw-monitor-wait/Android.bp
index ff28386..194423f 100644
--- a/test/1943-suspend-raw-monitor-wait/Android.bp
+++ b/test/1943-suspend-raw-monitor-wait/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1943-suspend-raw-monitor-wait`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1943-suspend-raw-monitor-wait",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1945-proxy-method-arguments/Android.bp b/test/1945-proxy-method-arguments/Android.bp
index 115efbc..8e0b1fb 100644
--- a/test/1945-proxy-method-arguments/Android.bp
+++ b/test/1945-proxy-method-arguments/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1945-proxy-method-arguments`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1945-proxy-method-arguments",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1947-breakpoint-redefine-deopt/Android.bp b/test/1947-breakpoint-redefine-deopt/Android.bp
index e6e68e3..d03fdad 100644
--- a/test/1947-breakpoint-redefine-deopt/Android.bp
+++ b/test/1947-breakpoint-redefine-deopt/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1947-breakpoint-redefine-deopt`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1947-breakpoint-redefine-deopt",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1949-short-dex-file/Android.bp b/test/1949-short-dex-file/Android.bp
index 9f710c6..74980fb 100644
--- a/test/1949-short-dex-file/Android.bp
+++ b/test/1949-short-dex-file/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1949-short-dex-file`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1949-short-dex-file",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1951-monitor-enter-no-suspend/Android.bp b/test/1951-monitor-enter-no-suspend/Android.bp
index 2f6b6f0..8e523f3 100644
--- a/test/1951-monitor-enter-no-suspend/Android.bp
+++ b/test/1951-monitor-enter-no-suspend/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1951-monitor-enter-no-suspend`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1951-monitor-enter-no-suspend",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1953-pop-frame/Android.bp b/test/1953-pop-frame/Android.bp
index ae82776..51da5cc 100644
--- a/test/1953-pop-frame/Android.bp
+++ b/test/1953-pop-frame/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1953-pop-frame`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1953-pop-frame",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1954-pop-frame-jit/Android.bp b/test/1954-pop-frame-jit/Android.bp
index 16d7bbe..fd4398a 100644
--- a/test/1954-pop-frame-jit/Android.bp
+++ b/test/1954-pop-frame-jit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1954-pop-frame-jit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1954-pop-frame-jit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1955-pop-frame-jit-called/Android.bp b/test/1955-pop-frame-jit-called/Android.bp
index 849f9cb..4e59614 100644
--- a/test/1955-pop-frame-jit-called/Android.bp
+++ b/test/1955-pop-frame-jit-called/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1955-pop-frame-jit-called`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1955-pop-frame-jit-called",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1956-pop-frame-jit-calling/Android.bp b/test/1956-pop-frame-jit-calling/Android.bp
index 2061c71..c3c96bc 100644
--- a/test/1956-pop-frame-jit-calling/Android.bp
+++ b/test/1956-pop-frame-jit-calling/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1956-pop-frame-jit-calling`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1956-pop-frame-jit-calling",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1957-error-ext/Android.bp b/test/1957-error-ext/Android.bp
index 71bc9fe..22a716a 100644
--- a/test/1957-error-ext/Android.bp
+++ b/test/1957-error-ext/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1957-error-ext`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1957-error-ext",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1958-transform-try-jit/Android.bp b/test/1958-transform-try-jit/Android.bp
index 10eb507..c7b026e 100644
--- a/test/1958-transform-try-jit/Android.bp
+++ b/test/1958-transform-try-jit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1958-transform-try-jit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1958-transform-try-jit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1959-redefine-object-instrument/Android.bp b/test/1959-redefine-object-instrument/Android.bp
index 8165f9c..143d5c6 100644
--- a/test/1959-redefine-object-instrument/Android.bp
+++ b/test/1959-redefine-object-instrument/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1959-redefine-object-instrument`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1959-redefine-object-instrument",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1960-checker-bounds-codegen/Android.bp b/test/1960-checker-bounds-codegen/Android.bp
index cdbe7cc..efb2b49 100644
--- a/test/1960-checker-bounds-codegen/Android.bp
+++ b/test/1960-checker-bounds-codegen/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1960-checker-bounds-codegen`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1960-checker-bounds-codegen",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1960-obsolete-jit-multithread-native/Android.bp b/test/1960-obsolete-jit-multithread-native/Android.bp
index 2410528..6e6a8eb 100644
--- a/test/1960-obsolete-jit-multithread-native/Android.bp
+++ b/test/1960-obsolete-jit-multithread-native/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1960-obsolete-jit-multithread-native`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1960-obsolete-jit-multithread-native",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1961-checker-loop-vectorizer/Android.bp b/test/1961-checker-loop-vectorizer/Android.bp
index e9d6adf..43bb4b9 100644
--- a/test/1961-checker-loop-vectorizer/Android.bp
+++ b/test/1961-checker-loop-vectorizer/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1961-checker-loop-vectorizer`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1961-checker-loop-vectorizer",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1961-obsolete-jit-multithread/Android.bp b/test/1961-obsolete-jit-multithread/Android.bp
index 42d2ba4..0e69c17 100644
--- a/test/1961-obsolete-jit-multithread/Android.bp
+++ b/test/1961-obsolete-jit-multithread/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1961-obsolete-jit-multithread`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1961-obsolete-jit-multithread",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1962-multi-thread-events/Android.bp b/test/1962-multi-thread-events/Android.bp
index 668a848..f31b753 100644
--- a/test/1962-multi-thread-events/Android.bp
+++ b/test/1962-multi-thread-events/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1962-multi-thread-events`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1962-multi-thread-events",
     defaults: ["art-run-test-defaults"],
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 82618a3..50a1e16 100644
--- a/test/1963-add-to-dex-classloader-in-memory/Android.bp
+++ b/test/1963-add-to-dex-classloader-in-memory/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1963-add-to-dex-classloader-in-memory`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1963-add-to-dex-classloader-in-memory",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1967-get-set-local-bad-slot/Android.bp b/test/1967-get-set-local-bad-slot/Android.bp
index 0d018bc..ff9ddbe 100644
--- a/test/1967-get-set-local-bad-slot/Android.bp
+++ b/test/1967-get-set-local-bad-slot/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1967-get-set-local-bad-slot`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1967-get-set-local-bad-slot",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1968-force-early-return/Android.bp b/test/1968-force-early-return/Android.bp
index 323761e..01abda0 100644
--- a/test/1968-force-early-return/Android.bp
+++ b/test/1968-force-early-return/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1968-force-early-return`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1968-force-early-return",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1969-force-early-return-void/Android.bp b/test/1969-force-early-return-void/Android.bp
index a974eda..dc4414b 100644
--- a/test/1969-force-early-return-void/Android.bp
+++ b/test/1969-force-early-return-void/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1969-force-early-return-void`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1969-force-early-return-void",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1970-force-early-return-long/Android.bp b/test/1970-force-early-return-long/Android.bp
index 5a648ce..fb24f51 100644
--- a/test/1970-force-early-return-long/Android.bp
+++ b/test/1970-force-early-return-long/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1970-force-early-return-long`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1970-force-early-return-long",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1971-multi-force-early-return/Android.bp b/test/1971-multi-force-early-return/Android.bp
index 31129dd..899bacd 100644
--- a/test/1971-multi-force-early-return/Android.bp
+++ b/test/1971-multi-force-early-return/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1971-multi-force-early-return`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1971-multi-force-early-return",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1972-jni-id-swap-indices/Android.bp b/test/1972-jni-id-swap-indices/Android.bp
index 249e7a5..c405e2d 100644
--- a/test/1972-jni-id-swap-indices/Android.bp
+++ b/test/1972-jni-id-swap-indices/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1972-jni-id-swap-indices`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1972-jni-id-swap-indices",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1973-jni-id-swap-pointer/Android.bp b/test/1973-jni-id-swap-pointer/Android.bp
index 406bf2f..1fef5f4 100644
--- a/test/1973-jni-id-swap-pointer/Android.bp
+++ b/test/1973-jni-id-swap-pointer/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1973-jni-id-swap-pointer`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1973-jni-id-swap-pointer",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1974-resize-array/Android.bp b/test/1974-resize-array/Android.bp
index 0a58f0b..e2d8f3c 100644
--- a/test/1974-resize-array/Android.bp
+++ b/test/1974-resize-array/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1974-resize-array`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1974-resize-array",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1975-hello-structural-transformation/Android.bp b/test/1975-hello-structural-transformation/Android.bp
index 49790f5..e96917d 100644
--- a/test/1975-hello-structural-transformation/Android.bp
+++ b/test/1975-hello-structural-transformation/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1975-hello-structural-transformation`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1975-hello-structural-transformation",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1976-hello-structural-static-methods/Android.bp b/test/1976-hello-structural-static-methods/Android.bp
index 02935f9..16430df 100644
--- a/test/1976-hello-structural-static-methods/Android.bp
+++ b/test/1976-hello-structural-static-methods/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1976-hello-structural-static-methods`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1976-hello-structural-static-methods",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1977-hello-structural-obsolescence/Android.bp b/test/1977-hello-structural-obsolescence/Android.bp
index da9e06a..4bb110e 100644
--- a/test/1977-hello-structural-obsolescence/Android.bp
+++ b/test/1977-hello-structural-obsolescence/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1977-hello-structural-obsolescence`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1977-hello-structural-obsolescence",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp b/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp
index c4013a1..2decff6 100644
--- a/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp
+++ b/test/1978-regular-obsolete-then-structural-obsolescence/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1978-regular-obsolete-then-structural-obsolescence`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1978-regular-obsolete-then-structural-obsolescence",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1979-threaded-structural-transformation/Android.bp b/test/1979-threaded-structural-transformation/Android.bp
index 4ff3fa6..d2dcf7f 100644
--- a/test/1979-threaded-structural-transformation/Android.bp
+++ b/test/1979-threaded-structural-transformation/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1979-threaded-structural-transformation`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1979-threaded-structural-transformation",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1980-obsolete-object-cleared/Android.bp b/test/1980-obsolete-object-cleared/Android.bp
index b751298..6404f85 100644
--- a/test/1980-obsolete-object-cleared/Android.bp
+++ b/test/1980-obsolete-object-cleared/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1980-obsolete-object-cleared`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1980-obsolete-object-cleared",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1982-no-virtuals-structural-redefinition/Android.bp b/test/1982-no-virtuals-structural-redefinition/Android.bp
index fb642b4..025bb7a 100644
--- a/test/1982-no-virtuals-structural-redefinition/Android.bp
+++ b/test/1982-no-virtuals-structural-redefinition/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1982-no-virtuals-structural-redefinition`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1982-no-virtuals-structural-redefinition",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1984-structural-redefine-field-trace/Android.bp b/test/1984-structural-redefine-field-trace/Android.bp
index 7f3f325..18ff27b 100644
--- a/test/1984-structural-redefine-field-trace/Android.bp
+++ b/test/1984-structural-redefine-field-trace/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1984-structural-redefine-field-trace`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1984-structural-redefine-field-trace",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1985-structural-redefine-stack-scope/Android.bp b/test/1985-structural-redefine-stack-scope/Android.bp
index 9b820fb..6200737 100644
--- a/test/1985-structural-redefine-stack-scope/Android.bp
+++ b/test/1985-structural-redefine-stack-scope/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1985-structural-redefine-stack-scope`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1985-structural-redefine-stack-scope",
     defaults: ["art-run-test-defaults"],
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 b4ae0c4..559d134 100644
--- a/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp
+++ b/test/1986-structural-redefine-multi-thread-stack-scope/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1986-structural-redefine-multi-thread-stack-scope`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1986-structural-redefine-multi-thread-stack-scope",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1987-structural-redefine-recursive-stack-scope/Android.bp b/test/1987-structural-redefine-recursive-stack-scope/Android.bp
index 4613b06..70f64dd 100644
--- a/test/1987-structural-redefine-recursive-stack-scope/Android.bp
+++ b/test/1987-structural-redefine-recursive-stack-scope/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1987-structural-redefine-recursive-stack-scope`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1987-structural-redefine-recursive-stack-scope",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1988-multi-structural-redefine/Android.bp b/test/1988-multi-structural-redefine/Android.bp
index 067a82d..57822b6 100644
--- a/test/1988-multi-structural-redefine/Android.bp
+++ b/test/1988-multi-structural-redefine/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1988-multi-structural-redefine`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1988-multi-structural-redefine",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1989-transform-bad-monitor/Android.bp b/test/1989-transform-bad-monitor/Android.bp
index 8104347..3aab06e 100644
--- a/test/1989-transform-bad-monitor/Android.bp
+++ b/test/1989-transform-bad-monitor/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1989-transform-bad-monitor`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1989-transform-bad-monitor",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1990-structural-bad-verify/Android.bp b/test/1990-structural-bad-verify/Android.bp
index 5750f0f..a312257 100644
--- a/test/1990-structural-bad-verify/Android.bp
+++ b/test/1990-structural-bad-verify/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1990-structural-bad-verify`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1990-structural-bad-verify",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1991-hello-structural-retransform/Android.bp b/test/1991-hello-structural-retransform/Android.bp
index c9ac1ba..ccb7696 100644
--- a/test/1991-hello-structural-retransform/Android.bp
+++ b/test/1991-hello-structural-retransform/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1991-hello-structural-retransform`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1991-hello-structural-retransform",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1992-retransform-no-such-field/Android.bp b/test/1992-retransform-no-such-field/Android.bp
index e694bde..ac26018 100644
--- a/test/1992-retransform-no-such-field/Android.bp
+++ b/test/1992-retransform-no-such-field/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1992-retransform-no-such-field`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1992-retransform-no-such-field",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1993-fallback-non-structural/Android.bp b/test/1993-fallback-non-structural/Android.bp
index acabf8c..f5098a7 100644
--- a/test/1993-fallback-non-structural/Android.bp
+++ b/test/1993-fallback-non-structural/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1993-fallback-non-structural`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1993-fallback-non-structural",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1994-final-virtual-structural/Android.bp b/test/1994-final-virtual-structural/Android.bp
index 48b7d03..6f889b6 100644
--- a/test/1994-final-virtual-structural/Android.bp
+++ b/test/1994-final-virtual-structural/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1994-final-virtual-structural`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1994-final-virtual-structural",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1995-final-virtual-structural-multithread/Android.bp b/test/1995-final-virtual-structural-multithread/Android.bp
index 8255d15..82a789f 100644
--- a/test/1995-final-virtual-structural-multithread/Android.bp
+++ b/test/1995-final-virtual-structural-multithread/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1995-final-virtual-structural-multithread`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1995-final-virtual-structural-multithread",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1996-final-override-virtual-structural/Android.bp b/test/1996-final-override-virtual-structural/Android.bp
index 1cb4e40..e823c93 100644
--- a/test/1996-final-override-virtual-structural/Android.bp
+++ b/test/1996-final-override-virtual-structural/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1996-final-override-virtual-structural`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1996-final-override-virtual-structural",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1997-structural-shadow-method/Android.bp b/test/1997-structural-shadow-method/Android.bp
index ae2ef1c..b7063b5 100644
--- a/test/1997-structural-shadow-method/Android.bp
+++ b/test/1997-structural-shadow-method/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1997-structural-shadow-method`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1997-structural-shadow-method",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1998-structural-shadow-field/Android.bp b/test/1998-structural-shadow-field/Android.bp
index d030c00..ef3b418 100644
--- a/test/1998-structural-shadow-field/Android.bp
+++ b/test/1998-structural-shadow-field/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1998-structural-shadow-field`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1998-structural-shadow-field",
     defaults: ["art-run-test-defaults"],
diff --git a/test/1999-virtual-structural/Android.bp b/test/1999-virtual-structural/Android.bp
index e4a8500..22fffdd 100644
--- a/test/1999-virtual-structural/Android.bp
+++ b/test/1999-virtual-structural/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `1999-virtual-structural`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-1999-virtual-structural",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2003-double-virtual-structural/Android.bp b/test/2003-double-virtual-structural/Android.bp
index a5130ff..2d23d91 100644
--- a/test/2003-double-virtual-structural/Android.bp
+++ b/test/2003-double-virtual-structural/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2003-double-virtual-structural`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2003-double-virtual-structural",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2004-double-virtual-structural-abstract/Android.bp b/test/2004-double-virtual-structural-abstract/Android.bp
index 4bef675..4981920 100644
--- a/test/2004-double-virtual-structural-abstract/Android.bp
+++ b/test/2004-double-virtual-structural-abstract/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2004-double-virtual-structural-abstract`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2004-double-virtual-structural-abstract",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2005-pause-all-redefine-multithreaded/Android.bp b/test/2005-pause-all-redefine-multithreaded/Android.bp
index 56389a0..ce54227 100644
--- a/test/2005-pause-all-redefine-multithreaded/Android.bp
+++ b/test/2005-pause-all-redefine-multithreaded/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2005-pause-all-redefine-multithreaded`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2005-pause-all-redefine-multithreaded",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2008-redefine-then-old-reflect-field/Android.bp b/test/2008-redefine-then-old-reflect-field/Android.bp
index 20d6fca..f3d28fb 100644
--- a/test/2008-redefine-then-old-reflect-field/Android.bp
+++ b/test/2008-redefine-then-old-reflect-field/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2008-redefine-then-old-reflect-field`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2008-redefine-then-old-reflect-field",
     defaults: ["art-run-test-defaults"],
diff --git a/test/201-built-in-except-detail-messages/Android.bp b/test/201-built-in-except-detail-messages/Android.bp
index 90a83c5..894dfb0 100644
--- a/test/201-built-in-except-detail-messages/Android.bp
+++ b/test/201-built-in-except-detail-messages/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `201-built-in-except-detail-messages`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-201-built-in-except-detail-messages",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2011-stack-walk-concurrent-instrument/Android.bp b/test/2011-stack-walk-concurrent-instrument/Android.bp
index 0103e0b..95820f2 100644
--- a/test/2011-stack-walk-concurrent-instrument/Android.bp
+++ b/test/2011-stack-walk-concurrent-instrument/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2011-stack-walk-concurrent-instrument`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2011-stack-walk-concurrent-instrument",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2019-constantcalculationsinking/Android.bp b/test/2019-constantcalculationsinking/Android.bp
index bc10c6d..d9b323b 100644
--- a/test/2019-constantcalculationsinking/Android.bp
+++ b/test/2019-constantcalculationsinking/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2019-constantcalculationsinking`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2019-constantcalculationsinking",
     defaults: ["art-run-test-defaults"],
diff --git a/test/202-thread-oome/Android.bp b/test/202-thread-oome/Android.bp
index 70f819d..d544432 100644
--- a/test/202-thread-oome/Android.bp
+++ b/test/202-thread-oome/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `202-thread-oome`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-202-thread-oome",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2020-InvokeVirtual-Inlining/Android.bp b/test/2020-InvokeVirtual-Inlining/Android.bp
index 4a35e09..2e62ccb 100644
--- a/test/2020-InvokeVirtual-Inlining/Android.bp
+++ b/test/2020-InvokeVirtual-Inlining/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2020-InvokeVirtual-Inlining`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2020-InvokeVirtual-Inlining",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2021-InvokeStatic-Inlining/Android.bp b/test/2021-InvokeStatic-Inlining/Android.bp
index e186d3e..f9e265f 100644
--- a/test/2021-InvokeStatic-Inlining/Android.bp
+++ b/test/2021-InvokeStatic-Inlining/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2021-InvokeStatic-Inlining`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2021-InvokeStatic-Inlining",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2022-Invariantloops/Android.bp b/test/2022-Invariantloops/Android.bp
index 7d05bde..e477d90 100644
--- a/test/2022-Invariantloops/Android.bp
+++ b/test/2022-Invariantloops/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2022-Invariantloops`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2022-Invariantloops",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2023-InvariantLoops_typecast/Android.bp b/test/2023-InvariantLoops_typecast/Android.bp
index ba54a20..27aa9bf 100644
--- a/test/2023-InvariantLoops_typecast/Android.bp
+++ b/test/2023-InvariantLoops_typecast/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2023-InvariantLoops_typecast`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2023-InvariantLoops_typecast",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2024-InvariantNegativeLoop/Android.bp b/test/2024-InvariantNegativeLoop/Android.bp
index fff8882..707aab6 100644
--- a/test/2024-InvariantNegativeLoop/Android.bp
+++ b/test/2024-InvariantNegativeLoop/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2024-InvariantNegativeLoop`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2024-InvariantNegativeLoop",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2025-ChangedArrayValue/Android.bp b/test/2025-ChangedArrayValue/Android.bp
index e613f56..451b862 100644
--- a/test/2025-ChangedArrayValue/Android.bp
+++ b/test/2025-ChangedArrayValue/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2025-ChangedArrayValue`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2025-ChangedArrayValue",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2026-DifferentMemoryLSCouples/Android.bp b/test/2026-DifferentMemoryLSCouples/Android.bp
index 9252570..1bdad83 100644
--- a/test/2026-DifferentMemoryLSCouples/Android.bp
+++ b/test/2026-DifferentMemoryLSCouples/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2026-DifferentMemoryLSCouples`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2026-DifferentMemoryLSCouples",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2027-TwiceTheSameMemoryCouple/Android.bp b/test/2027-TwiceTheSameMemoryCouple/Android.bp
index 0752554..1c66124 100644
--- a/test/2027-TwiceTheSameMemoryCouple/Android.bp
+++ b/test/2027-TwiceTheSameMemoryCouple/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2027-TwiceTheSameMemoryCouple`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2027-TwiceTheSameMemoryCouple",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2028-MultiBackward/Android.bp b/test/2028-MultiBackward/Android.bp
index dd73e45..4e031e5 100644
--- a/test/2028-MultiBackward/Android.bp
+++ b/test/2028-MultiBackward/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2028-MultiBackward`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2028-MultiBackward",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2029-contended-monitors/Android.bp b/test/2029-contended-monitors/Android.bp
index fd2faf8..fd27d42 100644
--- a/test/2029-contended-monitors/Android.bp
+++ b/test/2029-contended-monitors/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2029-contended-monitors`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2029-contended-monitors",
     defaults: ["art-run-test-defaults"],
diff --git a/test/203-multi-checkpoint/Android.bp b/test/203-multi-checkpoint/Android.bp
index 58d1323..c04e106 100644
--- a/test/203-multi-checkpoint/Android.bp
+++ b/test/203-multi-checkpoint/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `203-multi-checkpoint`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-203-multi-checkpoint",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2030-long-running-child/Android.bp b/test/2030-long-running-child/Android.bp
index c0ad4b9..aeba519 100644
--- a/test/2030-long-running-child/Android.bp
+++ b/test/2030-long-running-child/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2030-long-running-child`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2030-long-running-child",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2031-zygote-compiled-frame-deopt/Android.bp b/test/2031-zygote-compiled-frame-deopt/Android.bp
index a720ef2..654cd49 100644
--- a/test/2031-zygote-compiled-frame-deopt/Android.bp
+++ b/test/2031-zygote-compiled-frame-deopt/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2031-zygote-compiled-frame-deopt`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2031-zygote-compiled-frame-deopt",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2033-shutdown-mechanics/Android.bp b/test/2033-shutdown-mechanics/Android.bp
index 3db8aa0..56867b3 100644
--- a/test/2033-shutdown-mechanics/Android.bp
+++ b/test/2033-shutdown-mechanics/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2033-shutdown-mechanics`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2033-shutdown-mechanics",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2036-jni-filechannel/Android.bp b/test/2036-jni-filechannel/Android.bp
index 8a50dc0..1de73dd 100644
--- a/test/2036-jni-filechannel/Android.bp
+++ b/test/2036-jni-filechannel/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2036-jni-filechannel`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2036-jni-filechannel",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2037-thread-name-inherit/Android.bp b/test/2037-thread-name-inherit/Android.bp
index 4ebc58b..2fcfddc 100644
--- a/test/2037-thread-name-inherit/Android.bp
+++ b/test/2037-thread-name-inherit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2037-thread-name-inherit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2037-thread-name-inherit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2231-checker-heap-poisoning/Android.bp b/test/2231-checker-heap-poisoning/Android.bp
index 20fbc20..b2623e3 100644
--- a/test/2231-checker-heap-poisoning/Android.bp
+++ b/test/2231-checker-heap-poisoning/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2231-checker-heap-poisoning`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2231-checker-heap-poisoning",
     defaults: ["art-run-test-defaults"],
diff --git a/test/2232-write-metrics-to-log/Android.bp b/test/2232-write-metrics-to-log/Android.bp
index a429db4..a64567e 100644
--- a/test/2232-write-metrics-to-log/Android.bp
+++ b/test/2232-write-metrics-to-log/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `2232-write-metrics-to-log`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-2232-write-metrics-to-log",
     defaults: ["art-run-test-defaults"],
diff --git a/test/300-package-override/Android.bp b/test/300-package-override/Android.bp
index f5caa0f..cbe94c4 100644
--- a/test/300-package-override/Android.bp
+++ b/test/300-package-override/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `300-package-override`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-300-package-override",
     defaults: ["art-run-test-defaults"],
diff --git a/test/301-abstract-protected/Android.bp b/test/301-abstract-protected/Android.bp
index a57906d..02aae2d 100644
--- a/test/301-abstract-protected/Android.bp
+++ b/test/301-abstract-protected/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `301-abstract-protected`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-301-abstract-protected",
     defaults: ["art-run-test-defaults"],
diff --git a/test/302-float-conversion/Android.bp b/test/302-float-conversion/Android.bp
index d4ef006..ae5c76e 100644
--- a/test/302-float-conversion/Android.bp
+++ b/test/302-float-conversion/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `302-float-conversion`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-302-float-conversion",
     defaults: ["art-run-test-defaults"],
diff --git a/test/304-method-tracing/Android.bp b/test/304-method-tracing/Android.bp
index 36c6d5e..e627603 100644
--- a/test/304-method-tracing/Android.bp
+++ b/test/304-method-tracing/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `304-method-tracing`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-304-method-tracing",
     defaults: ["art-run-test-defaults"],
diff --git a/test/305-other-fault-handler/Android.bp b/test/305-other-fault-handler/Android.bp
index b45ca90..73e7455 100644
--- a/test/305-other-fault-handler/Android.bp
+++ b/test/305-other-fault-handler/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `305-other-fault-handler`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-305-other-fault-handler",
     defaults: ["art-run-test-defaults"],
diff --git a/test/401-optimizing-compiler/Android.bp b/test/401-optimizing-compiler/Android.bp
index 6c5ebaf..3335fca 100644
--- a/test/401-optimizing-compiler/Android.bp
+++ b/test/401-optimizing-compiler/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `401-optimizing-compiler`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-401-optimizing-compiler",
     defaults: ["art-run-test-defaults"],
diff --git a/test/402-optimizing-control-flow/Android.bp b/test/402-optimizing-control-flow/Android.bp
index 5845a36..c2db8c6 100644
--- a/test/402-optimizing-control-flow/Android.bp
+++ b/test/402-optimizing-control-flow/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `402-optimizing-control-flow`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-402-optimizing-control-flow",
     defaults: ["art-run-test-defaults"],
diff --git a/test/403-optimizing-long/Android.bp b/test/403-optimizing-long/Android.bp
index 7968996..fda0fbb 100644
--- a/test/403-optimizing-long/Android.bp
+++ b/test/403-optimizing-long/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `403-optimizing-long`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-403-optimizing-long",
     defaults: ["art-run-test-defaults"],
diff --git a/test/404-optimizing-allocator/Android.bp b/test/404-optimizing-allocator/Android.bp
index d948215..0cbef46 100644
--- a/test/404-optimizing-allocator/Android.bp
+++ b/test/404-optimizing-allocator/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `404-optimizing-allocator`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-404-optimizing-allocator",
     defaults: ["art-run-test-defaults"],
diff --git a/test/405-optimizing-long-allocator/Android.bp b/test/405-optimizing-long-allocator/Android.bp
index 9cf2ab7..50445c9 100644
--- a/test/405-optimizing-long-allocator/Android.bp
+++ b/test/405-optimizing-long-allocator/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `405-optimizing-long-allocator`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-405-optimizing-long-allocator",
     defaults: ["art-run-test-defaults"],
diff --git a/test/406-fields/Android.bp b/test/406-fields/Android.bp
index 24bdc7c..8e6b3d1 100644
--- a/test/406-fields/Android.bp
+++ b/test/406-fields/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `406-fields`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-406-fields",
     defaults: ["art-run-test-defaults"],
diff --git a/test/407-arrays/Android.bp b/test/407-arrays/Android.bp
index f0cb63b..20be07d 100644
--- a/test/407-arrays/Android.bp
+++ b/test/407-arrays/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `407-arrays`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-407-arrays",
     defaults: ["art-run-test-defaults"],
diff --git a/test/408-move-bug/Android.bp b/test/408-move-bug/Android.bp
index e7e4775..828f5c7 100644
--- a/test/408-move-bug/Android.bp
+++ b/test/408-move-bug/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `408-move-bug`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-408-move-bug",
     defaults: ["art-run-test-defaults"],
diff --git a/test/409-materialized-condition/Android.bp b/test/409-materialized-condition/Android.bp
index 7386eea..2aabaf2 100644
--- a/test/409-materialized-condition/Android.bp
+++ b/test/409-materialized-condition/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `409-materialized-condition`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-409-materialized-condition",
     defaults: ["art-run-test-defaults"],
diff --git a/test/410-floats/Android.bp b/test/410-floats/Android.bp
index f7ed6ba..4fa1ad4 100644
--- a/test/410-floats/Android.bp
+++ b/test/410-floats/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `410-floats`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-410-floats",
     defaults: ["art-run-test-defaults"],
diff --git a/test/411-checker-hdiv-hrem-const/Android.bp b/test/411-checker-hdiv-hrem-const/Android.bp
index f698c1b..e8932a6 100644
--- a/test/411-checker-hdiv-hrem-const/Android.bp
+++ b/test/411-checker-hdiv-hrem-const/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `411-checker-hdiv-hrem-const`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-411-checker-hdiv-hrem-const",
     defaults: ["art-run-test-defaults"],
diff --git a/test/411-checker-hdiv-hrem-pow2/Android.bp b/test/411-checker-hdiv-hrem-pow2/Android.bp
index 4d33e86..734a28f 100644
--- a/test/411-checker-hdiv-hrem-pow2/Android.bp
+++ b/test/411-checker-hdiv-hrem-pow2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `411-checker-hdiv-hrem-pow2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-411-checker-hdiv-hrem-pow2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/411-checker-instruct-simplifier-hrem/Android.bp b/test/411-checker-instruct-simplifier-hrem/Android.bp
index b8c9745..2d2a221 100644
--- a/test/411-checker-instruct-simplifier-hrem/Android.bp
+++ b/test/411-checker-instruct-simplifier-hrem/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `411-checker-instruct-simplifier-hrem`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-411-checker-instruct-simplifier-hrem",
     defaults: ["art-run-test-defaults"],
diff --git a/test/411-optimizing-arith/Android.bp b/test/411-optimizing-arith/Android.bp
index 638bf50..1a9b204 100644
--- a/test/411-optimizing-arith/Android.bp
+++ b/test/411-optimizing-arith/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `411-optimizing-arith`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-411-optimizing-arith",
     defaults: ["art-run-test-defaults"],
diff --git a/test/413-regalloc-regression/Android.bp b/test/413-regalloc-regression/Android.bp
index 82cd4ef..6ff8d95 100644
--- a/test/413-regalloc-regression/Android.bp
+++ b/test/413-regalloc-regression/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `413-regalloc-regression`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-413-regalloc-regression",
     defaults: ["art-run-test-defaults"],
diff --git a/test/414-static-fields/Android.bp b/test/414-static-fields/Android.bp
index 8c43ccc..7f105d4 100644
--- a/test/414-static-fields/Android.bp
+++ b/test/414-static-fields/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `414-static-fields`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-414-static-fields",
     defaults: ["art-run-test-defaults"],
diff --git a/test/418-const-string/Android.bp b/test/418-const-string/Android.bp
index bba34da..8a57f20 100644
--- a/test/418-const-string/Android.bp
+++ b/test/418-const-string/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `418-const-string`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-418-const-string",
     defaults: ["art-run-test-defaults"],
diff --git a/test/419-long-parameter/Android.bp b/test/419-long-parameter/Android.bp
index ebeecc3..5e3c417 100644
--- a/test/419-long-parameter/Android.bp
+++ b/test/419-long-parameter/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `419-long-parameter`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-419-long-parameter",
     defaults: ["art-run-test-defaults"],
diff --git a/test/420-const-class/Android.bp b/test/420-const-class/Android.bp
index 3bde5c7..11cd557 100644
--- a/test/420-const-class/Android.bp
+++ b/test/420-const-class/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `420-const-class`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-420-const-class",
     defaults: ["art-run-test-defaults"],
diff --git a/test/421-exceptions/Android.bp b/test/421-exceptions/Android.bp
index 2be91e0..d1ee341 100644
--- a/test/421-exceptions/Android.bp
+++ b/test/421-exceptions/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `421-exceptions`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-421-exceptions",
     defaults: ["art-run-test-defaults"],
diff --git a/test/421-large-frame/Android.bp b/test/421-large-frame/Android.bp
index 7695596..68f12f8 100644
--- a/test/421-large-frame/Android.bp
+++ b/test/421-large-frame/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `421-large-frame`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-421-large-frame",
     defaults: ["art-run-test-defaults"],
diff --git a/test/422-instanceof/Android.bp b/test/422-instanceof/Android.bp
index 440f177..983dbee 100644
--- a/test/422-instanceof/Android.bp
+++ b/test/422-instanceof/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `422-instanceof`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-422-instanceof",
     defaults: ["art-run-test-defaults"],
diff --git a/test/422-type-conversion/Android.bp b/test/422-type-conversion/Android.bp
index 4b37d6a..737f06b 100644
--- a/test/422-type-conversion/Android.bp
+++ b/test/422-type-conversion/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `422-type-conversion`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-422-type-conversion",
     defaults: ["art-run-test-defaults"],
diff --git a/test/423-invoke-interface/Android.bp b/test/423-invoke-interface/Android.bp
index dd356c5..49a1311 100644
--- a/test/423-invoke-interface/Android.bp
+++ b/test/423-invoke-interface/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `423-invoke-interface`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-423-invoke-interface",
     defaults: ["art-run-test-defaults"],
diff --git a/test/424-checkcast/Android.bp b/test/424-checkcast/Android.bp
index 4baf11a..11684c3 100644
--- a/test/424-checkcast/Android.bp
+++ b/test/424-checkcast/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `424-checkcast`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-424-checkcast",
     defaults: ["art-run-test-defaults"],
diff --git a/test/426-monitor/Android.bp b/test/426-monitor/Android.bp
index d441417..7bea5da 100644
--- a/test/426-monitor/Android.bp
+++ b/test/426-monitor/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `426-monitor`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-426-monitor",
     defaults: ["art-run-test-defaults"],
diff --git a/test/427-bitwise/Android.bp b/test/427-bitwise/Android.bp
index 7df5d1e..858aaf5 100644
--- a/test/427-bitwise/Android.bp
+++ b/test/427-bitwise/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `427-bitwise`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-427-bitwise",
     defaults: ["art-run-test-defaults"],
diff --git a/test/427-bounds/Android.bp b/test/427-bounds/Android.bp
index 48617c0..606c186 100644
--- a/test/427-bounds/Android.bp
+++ b/test/427-bounds/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `427-bounds`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-427-bounds",
     defaults: ["art-run-test-defaults"],
diff --git a/test/429-ssa-builder/Android.bp b/test/429-ssa-builder/Android.bp
index 77ab6aa..4e7b263 100644
--- a/test/429-ssa-builder/Android.bp
+++ b/test/429-ssa-builder/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `429-ssa-builder`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-429-ssa-builder",
     defaults: ["art-run-test-defaults"],
diff --git a/test/430-live-register-slow-path/Android.bp b/test/430-live-register-slow-path/Android.bp
index 925988f..0295e46 100644
--- a/test/430-live-register-slow-path/Android.bp
+++ b/test/430-live-register-slow-path/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `430-live-register-slow-path`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-430-live-register-slow-path",
     defaults: ["art-run-test-defaults"],
diff --git a/test/433-gvn/Android.bp b/test/433-gvn/Android.bp
index 2c190b6..e4f6b9a 100644
--- a/test/433-gvn/Android.bp
+++ b/test/433-gvn/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `433-gvn`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-433-gvn",
     defaults: ["art-run-test-defaults"],
diff --git a/test/434-shifter-operand/Android.bp b/test/434-shifter-operand/Android.bp
index 6e58737..4309d8a 100644
--- a/test/434-shifter-operand/Android.bp
+++ b/test/434-shifter-operand/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `434-shifter-operand`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-434-shifter-operand",
     defaults: ["art-run-test-defaults"],
diff --git a/test/435-try-finally-without-catch/Android.bp b/test/435-try-finally-without-catch/Android.bp
index 1f38fbb..d8c0409 100644
--- a/test/435-try-finally-without-catch/Android.bp
+++ b/test/435-try-finally-without-catch/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `435-try-finally-without-catch`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-435-try-finally-without-catch",
     defaults: ["art-run-test-defaults"],
diff --git a/test/436-rem-float/Android.bp b/test/436-rem-float/Android.bp
index 9578066..526f22f 100644
--- a/test/436-rem-float/Android.bp
+++ b/test/436-rem-float/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `436-rem-float`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-436-rem-float",
     defaults: ["art-run-test-defaults"],
diff --git a/test/436-shift-constant/Android.bp b/test/436-shift-constant/Android.bp
index 644366e..107e392 100644
--- a/test/436-shift-constant/Android.bp
+++ b/test/436-shift-constant/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `436-shift-constant`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-436-shift-constant",
     defaults: ["art-run-test-defaults"],
diff --git a/test/437-inline/Android.bp b/test/437-inline/Android.bp
index 1588bda..7596d03 100644
--- a/test/437-inline/Android.bp
+++ b/test/437-inline/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `437-inline`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-437-inline",
     defaults: ["art-run-test-defaults"],
diff --git a/test/438-volatile/Android.bp b/test/438-volatile/Android.bp
index 3ade1e3..adc4a80 100644
--- a/test/438-volatile/Android.bp
+++ b/test/438-volatile/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `438-volatile`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-438-volatile",
     defaults: ["art-run-test-defaults"],
diff --git a/test/439-npe/Android.bp b/test/439-npe/Android.bp
index 81f70c0..527b6cf 100644
--- a/test/439-npe/Android.bp
+++ b/test/439-npe/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `439-npe`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-439-npe",
     defaults: ["art-run-test-defaults"],
diff --git a/test/439-swap-double/Android.bp b/test/439-swap-double/Android.bp
index f1003d2..f175231 100644
--- a/test/439-swap-double/Android.bp
+++ b/test/439-swap-double/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `439-swap-double`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-439-swap-double",
     defaults: ["art-run-test-defaults"],
diff --git a/test/440-stmp/Android.bp b/test/440-stmp/Android.bp
index 473c49c..5ace2fc 100644
--- a/test/440-stmp/Android.bp
+++ b/test/440-stmp/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `440-stmp`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-440-stmp",
     defaults: ["art-run-test-defaults"],
diff --git a/test/441-checker-inliner/Android.bp b/test/441-checker-inliner/Android.bp
index 4939238..f4eef68 100644
--- a/test/441-checker-inliner/Android.bp
+++ b/test/441-checker-inliner/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `441-checker-inliner`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-441-checker-inliner",
     defaults: ["art-run-test-defaults"],
diff --git a/test/443-not-bool-inline/Android.bp b/test/443-not-bool-inline/Android.bp
index 9d718e1..706c992 100644
--- a/test/443-not-bool-inline/Android.bp
+++ b/test/443-not-bool-inline/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `443-not-bool-inline`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-443-not-bool-inline",
     defaults: ["art-run-test-defaults"],
diff --git a/test/444-checker-nce/Android.bp b/test/444-checker-nce/Android.bp
index 487116e..de79050 100644
--- a/test/444-checker-nce/Android.bp
+++ b/test/444-checker-nce/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `444-checker-nce`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-444-checker-nce",
     defaults: ["art-run-test-defaults"],
diff --git a/test/445-checker-licm/Android.bp b/test/445-checker-licm/Android.bp
index 08e3b52..0932efb 100644
--- a/test/445-checker-licm/Android.bp
+++ b/test/445-checker-licm/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `445-checker-licm`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-445-checker-licm",
     defaults: ["art-run-test-defaults"],
diff --git a/test/446-checker-inliner2/Android.bp b/test/446-checker-inliner2/Android.bp
index bd6e464..6f2e554 100644
--- a/test/446-checker-inliner2/Android.bp
+++ b/test/446-checker-inliner2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `446-checker-inliner2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-446-checker-inliner2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/447-checker-inliner3/Android.bp b/test/447-checker-inliner3/Android.bp
index 5c282ca..ee3b41b 100644
--- a/test/447-checker-inliner3/Android.bp
+++ b/test/447-checker-inliner3/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `447-checker-inliner3`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-447-checker-inliner3",
     defaults: ["art-run-test-defaults"],
diff --git a/test/449-checker-bce-rem/Android.bp b/test/449-checker-bce-rem/Android.bp
index 157696c..d6f10ee 100644
--- a/test/449-checker-bce-rem/Android.bp
+++ b/test/449-checker-bce-rem/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `449-checker-bce-rem`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-449-checker-bce-rem",
     defaults: ["art-run-test-defaults"],
diff --git a/test/449-checker-bce/Android.bp b/test/449-checker-bce/Android.bp
index f18c3a9..178c100 100644
--- a/test/449-checker-bce/Android.bp
+++ b/test/449-checker-bce/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `449-checker-bce`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-449-checker-bce",
     defaults: ["art-run-test-defaults"],
diff --git a/test/450-checker-types/Android.bp b/test/450-checker-types/Android.bp
index 7a14fb4..bf45226 100644
--- a/test/450-checker-types/Android.bp
+++ b/test/450-checker-types/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `450-checker-types`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-450-checker-types",
     defaults: ["art-run-test-defaults"],
diff --git a/test/451-regression-add-float/Android.bp b/test/451-regression-add-float/Android.bp
index d212e1c..26d7d0a 100644
--- a/test/451-regression-add-float/Android.bp
+++ b/test/451-regression-add-float/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `451-regression-add-float`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-451-regression-add-float",
     defaults: ["art-run-test-defaults"],
diff --git a/test/451-spill-splot/Android.bp b/test/451-spill-splot/Android.bp
index fca8a58..d773673 100644
--- a/test/451-spill-splot/Android.bp
+++ b/test/451-spill-splot/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `451-spill-splot`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-451-spill-splot",
     defaults: ["art-run-test-defaults"],
diff --git a/test/454-get-vreg/Android.bp b/test/454-get-vreg/Android.bp
index 04c6d91..5fcb974 100644
--- a/test/454-get-vreg/Android.bp
+++ b/test/454-get-vreg/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `454-get-vreg`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-454-get-vreg",
     defaults: ["art-run-test-defaults"],
diff --git a/test/455-checker-gvn/Android.bp b/test/455-checker-gvn/Android.bp
index 743295f..2e36616 100644
--- a/test/455-checker-gvn/Android.bp
+++ b/test/455-checker-gvn/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `455-checker-gvn`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-455-checker-gvn",
     defaults: ["art-run-test-defaults"],
diff --git a/test/456-baseline-array-set/Android.bp b/test/456-baseline-array-set/Android.bp
index 501e4e2b..28d83d0 100644
--- a/test/456-baseline-array-set/Android.bp
+++ b/test/456-baseline-array-set/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `456-baseline-array-set`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-456-baseline-array-set",
     defaults: ["art-run-test-defaults"],
diff --git a/test/458-long-to-fpu/Android.bp b/test/458-long-to-fpu/Android.bp
index 8adfd6a..efd612e 100644
--- a/test/458-long-to-fpu/Android.bp
+++ b/test/458-long-to-fpu/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `458-long-to-fpu`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-458-long-to-fpu",
     defaults: ["art-run-test-defaults"],
diff --git a/test/461-get-reference-vreg/Android.bp b/test/461-get-reference-vreg/Android.bp
index 3c5aa68..3793c59 100644
--- a/test/461-get-reference-vreg/Android.bp
+++ b/test/461-get-reference-vreg/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `461-get-reference-vreg`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-461-get-reference-vreg",
     defaults: ["art-run-test-defaults"],
diff --git a/test/464-checker-inline-sharpen-calls/Android.bp b/test/464-checker-inline-sharpen-calls/Android.bp
index 1b2ceea..aeff431 100644
--- a/test/464-checker-inline-sharpen-calls/Android.bp
+++ b/test/464-checker-inline-sharpen-calls/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `464-checker-inline-sharpen-calls`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-464-checker-inline-sharpen-calls",
     defaults: ["art-run-test-defaults"],
diff --git a/test/465-checker-clinit-gvn/Android.bp b/test/465-checker-clinit-gvn/Android.bp
index 851ccfe..eef374c 100644
--- a/test/465-checker-clinit-gvn/Android.bp
+++ b/test/465-checker-clinit-gvn/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `465-checker-clinit-gvn`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-465-checker-clinit-gvn",
     defaults: ["art-run-test-defaults"],
diff --git a/test/466-get-live-vreg/Android.bp b/test/466-get-live-vreg/Android.bp
index dcd5b2e..f4707f4 100644
--- a/test/466-get-live-vreg/Android.bp
+++ b/test/466-get-live-vreg/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `466-get-live-vreg`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-466-get-live-vreg",
     defaults: ["art-run-test-defaults"],
diff --git a/test/469-condition-materialization/Android.bp b/test/469-condition-materialization/Android.bp
index 39e93fe..c986141 100644
--- a/test/469-condition-materialization/Android.bp
+++ b/test/469-condition-materialization/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `469-condition-materialization`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-469-condition-materialization",
     defaults: ["art-run-test-defaults"],
diff --git a/test/470-huge-method/Android.bp b/test/470-huge-method/Android.bp
index 07a0e18..e5cabea 100644
--- a/test/470-huge-method/Android.bp
+++ b/test/470-huge-method/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `470-huge-method`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-470-huge-method",
     defaults: ["art-run-test-defaults"],
diff --git a/test/471-deopt-environment/Android.bp b/test/471-deopt-environment/Android.bp
index fabc2fa..d0eaca3 100644
--- a/test/471-deopt-environment/Android.bp
+++ b/test/471-deopt-environment/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `471-deopt-environment`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-471-deopt-environment",
     defaults: ["art-run-test-defaults"],
diff --git a/test/472-type-propagation/Android.bp b/test/472-type-propagation/Android.bp
index 0384a59..247e222 100644
--- a/test/472-type-propagation/Android.bp
+++ b/test/472-type-propagation/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `472-type-propagation`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-472-type-propagation",
     defaults: ["art-run-test-defaults"],
diff --git a/test/473-checker-inliner-constants/Android.bp b/test/473-checker-inliner-constants/Android.bp
index 6c9f64f..4768c70 100644
--- a/test/473-checker-inliner-constants/Android.bp
+++ b/test/473-checker-inliner-constants/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `473-checker-inliner-constants`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-473-checker-inliner-constants",
     defaults: ["art-run-test-defaults"],
diff --git a/test/473-remove-dead-block/Android.bp b/test/473-remove-dead-block/Android.bp
index 01fe64c..ea41453 100644
--- a/test/473-remove-dead-block/Android.bp
+++ b/test/473-remove-dead-block/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `473-remove-dead-block`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-473-remove-dead-block",
     defaults: ["art-run-test-defaults"],
diff --git a/test/474-checker-boolean-input/Android.bp b/test/474-checker-boolean-input/Android.bp
index 45d377e..505d4c2 100644
--- a/test/474-checker-boolean-input/Android.bp
+++ b/test/474-checker-boolean-input/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `474-checker-boolean-input`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-474-checker-boolean-input",
     defaults: ["art-run-test-defaults"],
diff --git a/test/474-fp-sub-neg/Android.bp b/test/474-fp-sub-neg/Android.bp
index b0e4706..2d61503 100644
--- a/test/474-fp-sub-neg/Android.bp
+++ b/test/474-fp-sub-neg/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `474-fp-sub-neg`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-474-fp-sub-neg",
     defaults: ["art-run-test-defaults"],
diff --git a/test/475-simplify-mul-zero/Android.bp b/test/475-simplify-mul-zero/Android.bp
index f2a8457..0e9dfd5 100644
--- a/test/475-simplify-mul-zero/Android.bp
+++ b/test/475-simplify-mul-zero/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `475-simplify-mul-zero`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-475-simplify-mul-zero",
     defaults: ["art-run-test-defaults"],
diff --git a/test/476-checker-ctor-fence-redun-elim/Android.bp b/test/476-checker-ctor-fence-redun-elim/Android.bp
index 6c241b4..a3db914 100644
--- a/test/476-checker-ctor-fence-redun-elim/Android.bp
+++ b/test/476-checker-ctor-fence-redun-elim/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `476-checker-ctor-fence-redun-elim`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-476-checker-ctor-fence-redun-elim",
     defaults: ["art-run-test-defaults"],
diff --git a/test/476-checker-ctor-memory-barrier/Android.bp b/test/476-checker-ctor-memory-barrier/Android.bp
index f29999a..ec92628 100644
--- a/test/476-checker-ctor-memory-barrier/Android.bp
+++ b/test/476-checker-ctor-memory-barrier/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `476-checker-ctor-memory-barrier`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-476-checker-ctor-memory-barrier",
     defaults: ["art-run-test-defaults"],
diff --git a/test/476-clinit-inline-static-invoke/Android.bp b/test/476-clinit-inline-static-invoke/Android.bp
index f21c110..c1fc1dc 100644
--- a/test/476-clinit-inline-static-invoke/Android.bp
+++ b/test/476-clinit-inline-static-invoke/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `476-clinit-inline-static-invoke`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-476-clinit-inline-static-invoke",
     defaults: ["art-run-test-defaults"],
diff --git a/test/477-checker-bound-type/Android.bp b/test/477-checker-bound-type/Android.bp
index 1f5b53e..72bf2a6 100644
--- a/test/477-checker-bound-type/Android.bp
+++ b/test/477-checker-bound-type/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `477-checker-bound-type`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-477-checker-bound-type",
     defaults: ["art-run-test-defaults"],
diff --git a/test/477-long-2-float-convers-precision/Android.bp b/test/477-long-2-float-convers-precision/Android.bp
index a9fdccd..baaf623 100644
--- a/test/477-long-2-float-convers-precision/Android.bp
+++ b/test/477-long-2-float-convers-precision/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `477-long-2-float-convers-precision`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-477-long-2-float-convers-precision",
     defaults: ["art-run-test-defaults"],
diff --git a/test/478-checker-clinit-check-pruning/Android.bp b/test/478-checker-clinit-check-pruning/Android.bp
index 6b2ee7c..c7a0346 100644
--- a/test/478-checker-clinit-check-pruning/Android.bp
+++ b/test/478-checker-clinit-check-pruning/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `478-checker-clinit-check-pruning`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-478-checker-clinit-check-pruning",
     defaults: ["art-run-test-defaults"],
diff --git a/test/478-checker-inline-noreturn/Android.bp b/test/478-checker-inline-noreturn/Android.bp
index 917f68b..a766f88 100644
--- a/test/478-checker-inline-noreturn/Android.bp
+++ b/test/478-checker-inline-noreturn/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `478-checker-inline-noreturn`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-478-checker-inline-noreturn",
     defaults: ["art-run-test-defaults"],
diff --git a/test/478-checker-inliner-nested-loop/Android.bp b/test/478-checker-inliner-nested-loop/Android.bp
index 153492f..afdcc16 100644
--- a/test/478-checker-inliner-nested-loop/Android.bp
+++ b/test/478-checker-inliner-nested-loop/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `478-checker-inliner-nested-loop`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-478-checker-inliner-nested-loop",
     defaults: ["art-run-test-defaults"],
diff --git a/test/479-regression-implicit-null-check/Android.bp b/test/479-regression-implicit-null-check/Android.bp
index 5bfbd4b..25d8907 100644
--- a/test/479-regression-implicit-null-check/Android.bp
+++ b/test/479-regression-implicit-null-check/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `479-regression-implicit-null-check`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-479-regression-implicit-null-check",
     defaults: ["art-run-test-defaults"],
diff --git a/test/480-checker-dead-blocks/Android.bp b/test/480-checker-dead-blocks/Android.bp
index 6a3e567..706a723 100644
--- a/test/480-checker-dead-blocks/Android.bp
+++ b/test/480-checker-dead-blocks/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `480-checker-dead-blocks`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-480-checker-dead-blocks",
     defaults: ["art-run-test-defaults"],
diff --git a/test/481-regression-phi-cond/Android.bp b/test/481-regression-phi-cond/Android.bp
index 6136228..cf9e14a 100644
--- a/test/481-regression-phi-cond/Android.bp
+++ b/test/481-regression-phi-cond/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `481-regression-phi-cond`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-481-regression-phi-cond",
     defaults: ["art-run-test-defaults"],
diff --git a/test/482-checker-loop-back-edge-use/Android.bp b/test/482-checker-loop-back-edge-use/Android.bp
index e896c31..6dfdddf 100644
--- a/test/482-checker-loop-back-edge-use/Android.bp
+++ b/test/482-checker-loop-back-edge-use/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `482-checker-loop-back-edge-use`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-482-checker-loop-back-edge-use",
     defaults: ["art-run-test-defaults"],
diff --git a/test/483-dce-block/Android.bp b/test/483-dce-block/Android.bp
index 520fb44..52ec2af 100644
--- a/test/483-dce-block/Android.bp
+++ b/test/483-dce-block/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `483-dce-block`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-483-dce-block",
     defaults: ["art-run-test-defaults"],
diff --git a/test/485-checker-dce-switch/Android.bp b/test/485-checker-dce-switch/Android.bp
index fd9468a..ea56461 100644
--- a/test/485-checker-dce-switch/Android.bp
+++ b/test/485-checker-dce-switch/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `485-checker-dce-switch`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-485-checker-dce-switch",
     defaults: ["art-run-test-defaults"],
diff --git a/test/486-checker-must-do-null-check/Android.bp b/test/486-checker-must-do-null-check/Android.bp
index dea104a..5c07c39 100644
--- a/test/486-checker-must-do-null-check/Android.bp
+++ b/test/486-checker-must-do-null-check/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `486-checker-must-do-null-check`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-486-checker-must-do-null-check",
     defaults: ["art-run-test-defaults"],
diff --git a/test/487-checker-inline-calls/Android.bp b/test/487-checker-inline-calls/Android.bp
index dcba884..42d64f4 100644
--- a/test/487-checker-inline-calls/Android.bp
+++ b/test/487-checker-inline-calls/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `487-checker-inline-calls`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-487-checker-inline-calls",
     defaults: ["art-run-test-defaults"],
diff --git a/test/488-checker-inline-recursive-calls/Android.bp b/test/488-checker-inline-recursive-calls/Android.bp
index 52d87c6..9a171ad 100644
--- a/test/488-checker-inline-recursive-calls/Android.bp
+++ b/test/488-checker-inline-recursive-calls/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `488-checker-inline-recursive-calls`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-488-checker-inline-recursive-calls",
     defaults: ["art-run-test-defaults"],
diff --git a/test/489-current-method-regression/Android.bp b/test/489-current-method-regression/Android.bp
index f2b1455..27aae46 100644
--- a/test/489-current-method-regression/Android.bp
+++ b/test/489-current-method-regression/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `489-current-method-regression`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-489-current-method-regression",
     defaults: ["art-run-test-defaults"],
diff --git a/test/490-checker-inline/Android.bp b/test/490-checker-inline/Android.bp
index 770b7a9..70ca37f 100644
--- a/test/490-checker-inline/Android.bp
+++ b/test/490-checker-inline/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `490-checker-inline`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-490-checker-inline",
     defaults: ["art-run-test-defaults"],
diff --git a/test/491-current-method/Android.bp b/test/491-current-method/Android.bp
index 8880ea1..af93f4b 100644
--- a/test/491-current-method/Android.bp
+++ b/test/491-current-method/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `491-current-method`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-491-current-method",
     defaults: ["art-run-test-defaults"],
diff --git a/test/492-checker-inline-invoke-interface/Android.bp b/test/492-checker-inline-invoke-interface/Android.bp
index be2326e..06eecee 100644
--- a/test/492-checker-inline-invoke-interface/Android.bp
+++ b/test/492-checker-inline-invoke-interface/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `492-checker-inline-invoke-interface`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-492-checker-inline-invoke-interface",
     defaults: ["art-run-test-defaults"],
diff --git a/test/493-checker-inline-invoke-interface/Android.bp b/test/493-checker-inline-invoke-interface/Android.bp
index fc6318f..4b981bf 100644
--- a/test/493-checker-inline-invoke-interface/Android.bp
+++ b/test/493-checker-inline-invoke-interface/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `493-checker-inline-invoke-interface`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-493-checker-inline-invoke-interface",
     defaults: ["art-run-test-defaults"],
diff --git a/test/494-checker-instanceof-tests/Android.bp b/test/494-checker-instanceof-tests/Android.bp
index 7d058c6..cd9c4c7 100644
--- a/test/494-checker-instanceof-tests/Android.bp
+++ b/test/494-checker-instanceof-tests/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `494-checker-instanceof-tests`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-494-checker-instanceof-tests",
     defaults: ["art-run-test-defaults"],
diff --git a/test/495-checker-checkcast-tests/Android.bp b/test/495-checker-checkcast-tests/Android.bp
index 1dd32d7..019a6fd 100644
--- a/test/495-checker-checkcast-tests/Android.bp
+++ b/test/495-checker-checkcast-tests/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `495-checker-checkcast-tests`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-495-checker-checkcast-tests",
     defaults: ["art-run-test-defaults"],
diff --git a/test/496-checker-inlining-class-loader/Android.bp b/test/496-checker-inlining-class-loader/Android.bp
index d20076f..17e838d 100644
--- a/test/496-checker-inlining-class-loader/Android.bp
+++ b/test/496-checker-inlining-class-loader/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `496-checker-inlining-class-loader`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-496-checker-inlining-class-loader",
     defaults: ["art-run-test-defaults"],
diff --git a/test/497-inlining-and-class-loader/Android.bp b/test/497-inlining-and-class-loader/Android.bp
index 291a55af..e36ec78 100644
--- a/test/497-inlining-and-class-loader/Android.bp
+++ b/test/497-inlining-and-class-loader/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `497-inlining-and-class-loader`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-497-inlining-and-class-loader",
     defaults: ["art-run-test-defaults"],
diff --git a/test/499-bce-phi-array-length/Android.bp b/test/499-bce-phi-array-length/Android.bp
index 32f8837..1af6673 100644
--- a/test/499-bce-phi-array-length/Android.bp
+++ b/test/499-bce-phi-array-length/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `499-bce-phi-array-length`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-499-bce-phi-array-length",
     defaults: ["art-run-test-defaults"],
diff --git a/test/500-instanceof/Android.bp b/test/500-instanceof/Android.bp
index f90b10d..fdb48a7 100644
--- a/test/500-instanceof/Android.bp
+++ b/test/500-instanceof/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `500-instanceof`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-500-instanceof",
     defaults: ["art-run-test-defaults"],
diff --git a/test/505-simplifier-type-propagation/Android.bp b/test/505-simplifier-type-propagation/Android.bp
index cebb4d4..4e8ab74 100644
--- a/test/505-simplifier-type-propagation/Android.bp
+++ b/test/505-simplifier-type-propagation/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `505-simplifier-type-propagation`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-505-simplifier-type-propagation",
     defaults: ["art-run-test-defaults"],
diff --git a/test/507-boolean-test/Android.bp b/test/507-boolean-test/Android.bp
index 21e2033..b1066bd 100644
--- a/test/507-boolean-test/Android.bp
+++ b/test/507-boolean-test/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `507-boolean-test`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-507-boolean-test",
     defaults: ["art-run-test-defaults"],
diff --git a/test/507-referrer/Android.bp b/test/507-referrer/Android.bp
index b8ec815..2062922 100644
--- a/test/507-referrer/Android.bp
+++ b/test/507-referrer/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `507-referrer`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-507-referrer",
     defaults: ["art-run-test-defaults"],
diff --git a/test/508-checker-disassembly/Android.bp b/test/508-checker-disassembly/Android.bp
index 428c9a2..a657c16 100644
--- a/test/508-checker-disassembly/Android.bp
+++ b/test/508-checker-disassembly/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `508-checker-disassembly`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-508-checker-disassembly",
     defaults: ["art-run-test-defaults"],
diff --git a/test/508-referrer-method/Android.bp b/test/508-referrer-method/Android.bp
index 8dcc645..0964765 100644
--- a/test/508-referrer-method/Android.bp
+++ b/test/508-referrer-method/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `508-referrer-method`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-508-referrer-method",
     defaults: ["art-run-test-defaults"],
diff --git a/test/513-array-deopt/Android.bp b/test/513-array-deopt/Android.bp
index 26e74ca..1ede9a8 100644
--- a/test/513-array-deopt/Android.bp
+++ b/test/513-array-deopt/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `513-array-deopt`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-513-array-deopt",
     defaults: ["art-run-test-defaults"],
diff --git a/test/514-shifts/Android.bp b/test/514-shifts/Android.bp
index d3f0198..e5bd604 100644
--- a/test/514-shifts/Android.bp
+++ b/test/514-shifts/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `514-shifts`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-514-shifts",
     defaults: ["art-run-test-defaults"],
diff --git a/test/519-bound-load-class/Android.bp b/test/519-bound-load-class/Android.bp
index 01d454a..5b0cbed 100644
--- a/test/519-bound-load-class/Android.bp
+++ b/test/519-bound-load-class/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `519-bound-load-class`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-519-bound-load-class",
     defaults: ["art-run-test-defaults"],
diff --git a/test/521-checker-array-set-null/Android.bp b/test/521-checker-array-set-null/Android.bp
index d855b52..1199d81 100644
--- a/test/521-checker-array-set-null/Android.bp
+++ b/test/521-checker-array-set-null/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `521-checker-array-set-null`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-521-checker-array-set-null",
     defaults: ["art-run-test-defaults"],
diff --git a/test/521-regression-integer-field-set/Android.bp b/test/521-regression-integer-field-set/Android.bp
index de3352f..b90141e 100644
--- a/test/521-regression-integer-field-set/Android.bp
+++ b/test/521-regression-integer-field-set/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `521-regression-integer-field-set`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-521-regression-integer-field-set",
     defaults: ["art-run-test-defaults"],
diff --git a/test/524-boolean-simplifier-regression/Android.bp b/test/524-boolean-simplifier-regression/Android.bp
index c1e8ef2..be075e8 100644
--- a/test/524-boolean-simplifier-regression/Android.bp
+++ b/test/524-boolean-simplifier-regression/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `524-boolean-simplifier-regression`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-524-boolean-simplifier-regression",
     defaults: ["art-run-test-defaults"],
diff --git a/test/525-checker-arrays-fields1/Android.bp b/test/525-checker-arrays-fields1/Android.bp
index 6a86c76..8cfe2b0 100644
--- a/test/525-checker-arrays-fields1/Android.bp
+++ b/test/525-checker-arrays-fields1/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `525-checker-arrays-fields1`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-525-checker-arrays-fields1",
     defaults: ["art-run-test-defaults"],
diff --git a/test/525-checker-arrays-fields2/Android.bp b/test/525-checker-arrays-fields2/Android.bp
index b6fdc40..c6e165b 100644
--- a/test/525-checker-arrays-fields2/Android.bp
+++ b/test/525-checker-arrays-fields2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `525-checker-arrays-fields2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-525-checker-arrays-fields2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/526-checker-caller-callee-regs/Android.bp b/test/526-checker-caller-callee-regs/Android.bp
index 4c2b073..d7087ac 100644
--- a/test/526-checker-caller-callee-regs/Android.bp
+++ b/test/526-checker-caller-callee-regs/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `526-checker-caller-callee-regs`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-526-checker-caller-callee-regs",
     defaults: ["art-run-test-defaults"],
diff --git a/test/526-long-regalloc/Android.bp b/test/526-long-regalloc/Android.bp
index eb1c1ff..34e4a2d 100644
--- a/test/526-long-regalloc/Android.bp
+++ b/test/526-long-regalloc/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `526-long-regalloc`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-526-long-regalloc",
     defaults: ["art-run-test-defaults"],
diff --git a/test/527-checker-array-access-simd/Android.bp b/test/527-checker-array-access-simd/Android.bp
index c7e40c6..96bb43a 100644
--- a/test/527-checker-array-access-simd/Android.bp
+++ b/test/527-checker-array-access-simd/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `527-checker-array-access-simd`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-527-checker-array-access-simd",
     defaults: ["art-run-test-defaults"],
diff --git a/test/527-checker-array-access-split/Android.bp b/test/527-checker-array-access-split/Android.bp
index 77da558..849530a 100644
--- a/test/527-checker-array-access-split/Android.bp
+++ b/test/527-checker-array-access-split/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `527-checker-array-access-split`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-527-checker-array-access-split",
     defaults: ["art-run-test-defaults"],
diff --git a/test/528-long-hint/Android.bp b/test/528-long-hint/Android.bp
index 910102f..b3ddd56 100644
--- a/test/528-long-hint/Android.bp
+++ b/test/528-long-hint/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `528-long-hint`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-528-long-hint",
     defaults: ["art-run-test-defaults"],
diff --git a/test/529-long-split/Android.bp b/test/529-long-split/Android.bp
index 2b78cfc..d607272 100644
--- a/test/529-long-split/Android.bp
+++ b/test/529-long-split/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `529-long-split`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-529-long-split",
     defaults: ["art-run-test-defaults"],
diff --git a/test/530-checker-loops1/Android.bp b/test/530-checker-loops1/Android.bp
index 838960f..6bbb5af 100644
--- a/test/530-checker-loops1/Android.bp
+++ b/test/530-checker-loops1/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `530-checker-loops1`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-loops1",
     defaults: ["art-run-test-defaults"],
diff --git a/test/530-checker-loops2/Android.bp b/test/530-checker-loops2/Android.bp
index 39f9bb29..d196923 100644
--- a/test/530-checker-loops2/Android.bp
+++ b/test/530-checker-loops2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `530-checker-loops2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-loops2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/530-checker-loops3/Android.bp b/test/530-checker-loops3/Android.bp
index d747303..ef2f738 100644
--- a/test/530-checker-loops3/Android.bp
+++ b/test/530-checker-loops3/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `530-checker-loops3`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-loops3",
     defaults: ["art-run-test-defaults"],
diff --git a/test/530-checker-loops4/Android.bp b/test/530-checker-loops4/Android.bp
index cd95bb1..5401466 100644
--- a/test/530-checker-loops4/Android.bp
+++ b/test/530-checker-loops4/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `530-checker-loops4`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-loops4",
     defaults: ["art-run-test-defaults"],
diff --git a/test/530-checker-loops5/Android.bp b/test/530-checker-loops5/Android.bp
index 4d555d2..658e985 100644
--- a/test/530-checker-loops5/Android.bp
+++ b/test/530-checker-loops5/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `530-checker-loops5`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-loops5",
     defaults: ["art-run-test-defaults"],
diff --git a/test/530-checker-lse-ctor-fences/Android.bp b/test/530-checker-lse-ctor-fences/Android.bp
index dc33c6f..c42ed96 100644
--- a/test/530-checker-lse-ctor-fences/Android.bp
+++ b/test/530-checker-lse-ctor-fences/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `530-checker-lse-ctor-fences`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-lse-ctor-fences",
     defaults: ["art-run-test-defaults"],
diff --git a/test/530-checker-lse-simd/Android.bp b/test/530-checker-lse-simd/Android.bp
index 5fa49b8..cf08d41 100644
--- a/test/530-checker-lse-simd/Android.bp
+++ b/test/530-checker-lse-simd/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `530-checker-lse-simd`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-lse-simd",
     defaults: ["art-run-test-defaults"],
diff --git a/test/530-checker-lse/Android.bp b/test/530-checker-lse/Android.bp
index 41a200c..ea8995e 100644
--- a/test/530-checker-lse/Android.bp
+++ b/test/530-checker-lse/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `530-checker-lse`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-lse",
     defaults: ["art-run-test-defaults"],
diff --git a/test/530-checker-lse2/Android.bp b/test/530-checker-lse2/Android.bp
index 07d344f..ca5e7f0 100644
--- a/test/530-checker-lse2/Android.bp
+++ b/test/530-checker-lse2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `530-checker-lse2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-checker-lse2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/530-instanceof-checkcast/Android.bp b/test/530-instanceof-checkcast/Android.bp
index bd6eae5..3b782c4 100644
--- a/test/530-instanceof-checkcast/Android.bp
+++ b/test/530-instanceof-checkcast/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `530-instanceof-checkcast`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-instanceof-checkcast",
     defaults: ["art-run-test-defaults"],
diff --git a/test/530-regression-lse/Android.bp b/test/530-regression-lse/Android.bp
index 9f9b506..e154810 100644
--- a/test/530-regression-lse/Android.bp
+++ b/test/530-regression-lse/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `530-regression-lse`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-530-regression-lse",
     defaults: ["art-run-test-defaults"],
diff --git a/test/532-checker-nonnull-arrayset/Android.bp b/test/532-checker-nonnull-arrayset/Android.bp
index ddd0538..5ada4c5 100644
--- a/test/532-checker-nonnull-arrayset/Android.bp
+++ b/test/532-checker-nonnull-arrayset/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `532-checker-nonnull-arrayset`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-532-checker-nonnull-arrayset",
     defaults: ["art-run-test-defaults"],
diff --git a/test/534-checker-bce-deoptimization/Android.bp b/test/534-checker-bce-deoptimization/Android.bp
index 9a55577..7fcfce0 100644
--- a/test/534-checker-bce-deoptimization/Android.bp
+++ b/test/534-checker-bce-deoptimization/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `534-checker-bce-deoptimization`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-534-checker-bce-deoptimization",
     defaults: ["art-run-test-defaults"],
diff --git a/test/535-deopt-and-inlining/Android.bp b/test/535-deopt-and-inlining/Android.bp
index 39a6382..2429c1e 100644
--- a/test/535-deopt-and-inlining/Android.bp
+++ b/test/535-deopt-and-inlining/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `535-deopt-and-inlining`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-535-deopt-and-inlining",
     defaults: ["art-run-test-defaults"],
diff --git a/test/536-checker-intrinsic-optimization/Android.bp b/test/536-checker-intrinsic-optimization/Android.bp
index f3c711e..b9832af 100644
--- a/test/536-checker-intrinsic-optimization/Android.bp
+++ b/test/536-checker-intrinsic-optimization/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `536-checker-intrinsic-optimization`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-536-checker-intrinsic-optimization",
     defaults: ["art-run-test-defaults"],
diff --git a/test/537-checker-arraycopy/Android.bp b/test/537-checker-arraycopy/Android.bp
index 9fa413b..83b7bd3 100644
--- a/test/537-checker-arraycopy/Android.bp
+++ b/test/537-checker-arraycopy/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `537-checker-arraycopy`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-537-checker-arraycopy",
     defaults: ["art-run-test-defaults"],
diff --git a/test/537-checker-jump-over-jump/Android.bp b/test/537-checker-jump-over-jump/Android.bp
index 4360bab..e53a69f 100644
--- a/test/537-checker-jump-over-jump/Android.bp
+++ b/test/537-checker-jump-over-jump/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `537-checker-jump-over-jump`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-537-checker-jump-over-jump",
     defaults: ["art-run-test-defaults"],
diff --git a/test/538-checker-embed-constants/Android.bp b/test/538-checker-embed-constants/Android.bp
index b960575..5fa5a74 100644
--- a/test/538-checker-embed-constants/Android.bp
+++ b/test/538-checker-embed-constants/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `538-checker-embed-constants`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-538-checker-embed-constants",
     defaults: ["art-run-test-defaults"],
diff --git a/test/540-checker-rtp-bug/Android.bp b/test/540-checker-rtp-bug/Android.bp
index dcedf93..413e55d 100644
--- a/test/540-checker-rtp-bug/Android.bp
+++ b/test/540-checker-rtp-bug/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `540-checker-rtp-bug`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-540-checker-rtp-bug",
     defaults: ["art-run-test-defaults"],
diff --git a/test/542-bitfield-rotates/Android.bp b/test/542-bitfield-rotates/Android.bp
index c3e9900..21f6999 100644
--- a/test/542-bitfield-rotates/Android.bp
+++ b/test/542-bitfield-rotates/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `542-bitfield-rotates`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-542-bitfield-rotates",
     defaults: ["art-run-test-defaults"],
diff --git a/test/542-inline-trycatch/Android.bp b/test/542-inline-trycatch/Android.bp
index 1312fee..41ca049 100644
--- a/test/542-inline-trycatch/Android.bp
+++ b/test/542-inline-trycatch/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `542-inline-trycatch`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-542-inline-trycatch",
     defaults: ["art-run-test-defaults"],
diff --git a/test/542-unresolved-access-check/Android.bp b/test/542-unresolved-access-check/Android.bp
index b1a216b..cb77b50 100644
--- a/test/542-unresolved-access-check/Android.bp
+++ b/test/542-unresolved-access-check/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `542-unresolved-access-check`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-542-unresolved-access-check",
     defaults: ["art-run-test-defaults"],
diff --git a/test/545-tracing-and-jit/Android.bp b/test/545-tracing-and-jit/Android.bp
index 123cd88..2615572 100644
--- a/test/545-tracing-and-jit/Android.bp
+++ b/test/545-tracing-and-jit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `545-tracing-and-jit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-545-tracing-and-jit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/548-checker-inlining-and-dce/Android.bp b/test/548-checker-inlining-and-dce/Android.bp
index ce9af14..eb4874a 100644
--- a/test/548-checker-inlining-and-dce/Android.bp
+++ b/test/548-checker-inlining-and-dce/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `548-checker-inlining-and-dce`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-548-checker-inlining-and-dce",
     defaults: ["art-run-test-defaults"],
diff --git a/test/549-checker-types-merge/Android.bp b/test/549-checker-types-merge/Android.bp
index 2c6b6be..6899fbc 100644
--- a/test/549-checker-types-merge/Android.bp
+++ b/test/549-checker-types-merge/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `549-checker-types-merge`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-549-checker-types-merge",
     defaults: ["art-run-test-defaults"],
diff --git a/test/550-checker-multiply-accumulate/Android.bp b/test/550-checker-multiply-accumulate/Android.bp
index eefe32d..12ad79b 100644
--- a/test/550-checker-multiply-accumulate/Android.bp
+++ b/test/550-checker-multiply-accumulate/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `550-checker-multiply-accumulate`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-550-checker-multiply-accumulate",
     defaults: ["art-run-test-defaults"],
diff --git a/test/550-new-instance-clinit/Android.bp b/test/550-new-instance-clinit/Android.bp
index 0c0cfae..458aa58 100644
--- a/test/550-new-instance-clinit/Android.bp
+++ b/test/550-new-instance-clinit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `550-new-instance-clinit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-550-new-instance-clinit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/551-checker-clinit/Android.bp b/test/551-checker-clinit/Android.bp
index 5965e9e..8004ade 100644
--- a/test/551-checker-clinit/Android.bp
+++ b/test/551-checker-clinit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `551-checker-clinit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-551-checker-clinit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/551-checker-shifter-operand/Android.bp b/test/551-checker-shifter-operand/Android.bp
index dd6befd..3a971ca 100644
--- a/test/551-checker-shifter-operand/Android.bp
+++ b/test/551-checker-shifter-operand/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `551-checker-shifter-operand`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-551-checker-shifter-operand",
     defaults: ["art-run-test-defaults"],
diff --git a/test/551-implicit-null-checks/Android.bp b/test/551-implicit-null-checks/Android.bp
index 1bb6ec9..a29f36d 100644
--- a/test/551-implicit-null-checks/Android.bp
+++ b/test/551-implicit-null-checks/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `551-implicit-null-checks`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-551-implicit-null-checks",
     defaults: ["art-run-test-defaults"],
diff --git a/test/552-checker-sharpening/Android.bp b/test/552-checker-sharpening/Android.bp
index e1101ab..6b28722 100644
--- a/test/552-checker-sharpening/Android.bp
+++ b/test/552-checker-sharpening/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `552-checker-sharpening`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-552-checker-sharpening",
     defaults: ["art-run-test-defaults"],
diff --git a/test/552-checker-x86-avx2-bit-manipulation/Android.bp b/test/552-checker-x86-avx2-bit-manipulation/Android.bp
index 5039184..505b631 100644
--- a/test/552-checker-x86-avx2-bit-manipulation/Android.bp
+++ b/test/552-checker-x86-avx2-bit-manipulation/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `552-checker-x86-avx2-bit-manipulation`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-552-checker-x86-avx2-bit-manipulation",
     defaults: ["art-run-test-defaults"],
diff --git a/test/554-checker-rtp-checkcast/Android.bp b/test/554-checker-rtp-checkcast/Android.bp
index e98dc5e..7c4bf6c 100644
--- a/test/554-checker-rtp-checkcast/Android.bp
+++ b/test/554-checker-rtp-checkcast/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `554-checker-rtp-checkcast`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-554-checker-rtp-checkcast",
     defaults: ["art-run-test-defaults"],
diff --git a/test/555-UnsafeGetLong-regression/Android.bp b/test/555-UnsafeGetLong-regression/Android.bp
index 640d56f..8559b4a 100644
--- a/test/555-UnsafeGetLong-regression/Android.bp
+++ b/test/555-UnsafeGetLong-regression/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `555-UnsafeGetLong-regression`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-555-UnsafeGetLong-regression",
     defaults: ["art-run-test-defaults"],
diff --git a/test/557-checker-instruct-simplifier-ror/Android.bp b/test/557-checker-instruct-simplifier-ror/Android.bp
index 0414ec7..a424b8a 100644
--- a/test/557-checker-instruct-simplifier-ror/Android.bp
+++ b/test/557-checker-instruct-simplifier-ror/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `557-checker-instruct-simplifier-ror`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-557-checker-instruct-simplifier-ror",
     defaults: ["art-run-test-defaults"],
diff --git a/test/558-switch/Android.bp b/test/558-switch/Android.bp
index c97efdd..7c7ffdd 100644
--- a/test/558-switch/Android.bp
+++ b/test/558-switch/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `558-switch`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-558-switch",
     defaults: ["art-run-test-defaults"],
diff --git a/test/559-bce-ssa/Android.bp b/test/559-bce-ssa/Android.bp
index 171e05e..025c7fe 100644
--- a/test/559-bce-ssa/Android.bp
+++ b/test/559-bce-ssa/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `559-bce-ssa`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-559-bce-ssa",
     defaults: ["art-run-test-defaults"],
diff --git a/test/559-checker-rtp-ifnotnull/Android.bp b/test/559-checker-rtp-ifnotnull/Android.bp
index d864bda..68bcb7e 100644
--- a/test/559-checker-rtp-ifnotnull/Android.bp
+++ b/test/559-checker-rtp-ifnotnull/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `559-checker-rtp-ifnotnull`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-559-checker-rtp-ifnotnull",
     defaults: ["art-run-test-defaults"],
diff --git a/test/560-packed-switch/Android.bp b/test/560-packed-switch/Android.bp
index 7c2f48c..418aa6d 100644
--- a/test/560-packed-switch/Android.bp
+++ b/test/560-packed-switch/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `560-packed-switch`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-560-packed-switch",
     defaults: ["art-run-test-defaults"],
diff --git a/test/561-divrem/Android.bp b/test/561-divrem/Android.bp
index 462b580..b07e10e 100644
--- a/test/561-divrem/Android.bp
+++ b/test/561-divrem/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `561-divrem`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-561-divrem",
     defaults: ["art-run-test-defaults"],
diff --git a/test/561-shared-slowpaths/Android.bp b/test/561-shared-slowpaths/Android.bp
index 666cf98..1058c0c 100644
--- a/test/561-shared-slowpaths/Android.bp
+++ b/test/561-shared-slowpaths/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `561-shared-slowpaths`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-561-shared-slowpaths",
     defaults: ["art-run-test-defaults"],
diff --git a/test/562-bce-preheader/Android.bp b/test/562-bce-preheader/Android.bp
index b88e4c9..d7c9792 100644
--- a/test/562-bce-preheader/Android.bp
+++ b/test/562-bce-preheader/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `562-bce-preheader`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-562-bce-preheader",
     defaults: ["art-run-test-defaults"],
diff --git a/test/562-checker-no-intermediate/Android.bp b/test/562-checker-no-intermediate/Android.bp
index af79591..36a4fd9 100644
--- a/test/562-checker-no-intermediate/Android.bp
+++ b/test/562-checker-no-intermediate/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `562-checker-no-intermediate`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-562-checker-no-intermediate",
     defaults: ["art-run-test-defaults"],
diff --git a/test/563-checker-invoke-super/Android.bp b/test/563-checker-invoke-super/Android.bp
index 32fe725..1097d85 100644
--- a/test/563-checker-invoke-super/Android.bp
+++ b/test/563-checker-invoke-super/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `563-checker-invoke-super`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-563-checker-invoke-super",
     defaults: ["art-run-test-defaults"],
diff --git a/test/564-checker-bitcount/Android.bp b/test/564-checker-bitcount/Android.bp
index b2b5bf7..85c81bb 100644
--- a/test/564-checker-bitcount/Android.bp
+++ b/test/564-checker-bitcount/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `564-checker-bitcount`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-564-checker-bitcount",
     defaults: ["art-run-test-defaults"],
diff --git a/test/564-checker-inline-loop/Android.bp b/test/564-checker-inline-loop/Android.bp
index 9c04c44..6f0a159 100644
--- a/test/564-checker-inline-loop/Android.bp
+++ b/test/564-checker-inline-loop/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `564-checker-inline-loop`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-564-checker-inline-loop",
     defaults: ["art-run-test-defaults"],
diff --git a/test/564-checker-negbitwise/Android.bp b/test/564-checker-negbitwise/Android.bp
index ff23943..8d658a1 100644
--- a/test/564-checker-negbitwise/Android.bp
+++ b/test/564-checker-negbitwise/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `564-checker-negbitwise`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-564-checker-negbitwise",
     defaults: ["art-run-test-defaults"],
diff --git a/test/565-checker-condition-liveness/Android.bp b/test/565-checker-condition-liveness/Android.bp
index a07c130..c70f56a 100644
--- a/test/565-checker-condition-liveness/Android.bp
+++ b/test/565-checker-condition-liveness/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `565-checker-condition-liveness`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-565-checker-condition-liveness",
     defaults: ["art-run-test-defaults"],
diff --git a/test/566-checker-codegen-select/Android.bp b/test/566-checker-codegen-select/Android.bp
index d4ffa05..27c5f48 100644
--- a/test/566-checker-codegen-select/Android.bp
+++ b/test/566-checker-codegen-select/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `566-checker-codegen-select`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-566-checker-codegen-select",
     defaults: ["art-run-test-defaults"],
diff --git a/test/566-polymorphic-inlining/Android.bp b/test/566-polymorphic-inlining/Android.bp
index 72d0bf2..a506424 100644
--- a/test/566-polymorphic-inlining/Android.bp
+++ b/test/566-polymorphic-inlining/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `566-polymorphic-inlining`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-566-polymorphic-inlining",
     defaults: ["art-run-test-defaults"],
diff --git a/test/567-checker-builder-intrinsics/Android.bp b/test/567-checker-builder-intrinsics/Android.bp
index 49e9817..5bf3c03 100644
--- a/test/567-checker-builder-intrinsics/Android.bp
+++ b/test/567-checker-builder-intrinsics/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `567-checker-builder-intrinsics`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-567-checker-builder-intrinsics",
     defaults: ["art-run-test-defaults"],
diff --git a/test/568-checker-onebit/Android.bp b/test/568-checker-onebit/Android.bp
index 6013cf3..649b81c 100644
--- a/test/568-checker-onebit/Android.bp
+++ b/test/568-checker-onebit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `568-checker-onebit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-568-checker-onebit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/570-checker-select/Android.bp b/test/570-checker-select/Android.bp
index 5899876..e41303d 100644
--- a/test/570-checker-select/Android.bp
+++ b/test/570-checker-select/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `570-checker-select`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-570-checker-select",
     defaults: ["art-run-test-defaults"],
diff --git a/test/572-checker-array-get-regression/Android.bp b/test/572-checker-array-get-regression/Android.bp
index 50f6465..415a9f1 100644
--- a/test/572-checker-array-get-regression/Android.bp
+++ b/test/572-checker-array-get-regression/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `572-checker-array-get-regression`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-572-checker-array-get-regression",
     defaults: ["art-run-test-defaults"],
diff --git a/test/573-checker-checkcast-regression/Android.bp b/test/573-checker-checkcast-regression/Android.bp
index c5aa500..cf7186f 100644
--- a/test/573-checker-checkcast-regression/Android.bp
+++ b/test/573-checker-checkcast-regression/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `573-checker-checkcast-regression`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-573-checker-checkcast-regression",
     defaults: ["art-run-test-defaults"],
diff --git a/test/576-polymorphic-inlining/Android.bp b/test/576-polymorphic-inlining/Android.bp
index c9d39b4..f40b51e 100644
--- a/test/576-polymorphic-inlining/Android.bp
+++ b/test/576-polymorphic-inlining/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `576-polymorphic-inlining`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-576-polymorphic-inlining",
     defaults: ["art-run-test-defaults"],
diff --git a/test/577-checker-fp2int/Android.bp b/test/577-checker-fp2int/Android.bp
index 9dbf403..cd0a5d3 100644
--- a/test/577-checker-fp2int/Android.bp
+++ b/test/577-checker-fp2int/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `577-checker-fp2int`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-577-checker-fp2int",
     defaults: ["art-run-test-defaults"],
diff --git a/test/578-bce-visit/Android.bp b/test/578-bce-visit/Android.bp
index 27cec56..bddc53e 100644
--- a/test/578-bce-visit/Android.bp
+++ b/test/578-bce-visit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `578-bce-visit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-578-bce-visit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/578-polymorphic-inlining/Android.bp b/test/578-polymorphic-inlining/Android.bp
index fa0478c..207c91b 100644
--- a/test/578-polymorphic-inlining/Android.bp
+++ b/test/578-polymorphic-inlining/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `578-polymorphic-inlining`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-578-polymorphic-inlining",
     defaults: ["art-run-test-defaults"],
diff --git a/test/579-inline-infinite/Android.bp b/test/579-inline-infinite/Android.bp
index e427361..39fce3f 100644
--- a/test/579-inline-infinite/Android.bp
+++ b/test/579-inline-infinite/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `579-inline-infinite`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-579-inline-infinite",
     defaults: ["art-run-test-defaults"],
diff --git a/test/580-checker-round/Android.bp b/test/580-checker-round/Android.bp
index 3e1641b..5a05b19 100644
--- a/test/580-checker-round/Android.bp
+++ b/test/580-checker-round/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `580-checker-round`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-580-checker-round",
     defaults: ["art-run-test-defaults"],
diff --git a/test/580-crc32/Android.bp b/test/580-crc32/Android.bp
index 1170f57..7d20949 100644
--- a/test/580-crc32/Android.bp
+++ b/test/580-crc32/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `580-crc32`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-580-crc32",
     defaults: ["art-run-test-defaults"],
diff --git a/test/581-rtp/Android.bp b/test/581-rtp/Android.bp
index eb4c3da..9966080 100644
--- a/test/581-rtp/Android.bp
+++ b/test/581-rtp/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `581-rtp`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-581-rtp",
     defaults: ["art-run-test-defaults"],
diff --git a/test/582-checker-bce-length/Android.bp b/test/582-checker-bce-length/Android.bp
index ca4f94b..937fd2d 100644
--- a/test/582-checker-bce-length/Android.bp
+++ b/test/582-checker-bce-length/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `582-checker-bce-length`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-582-checker-bce-length",
     defaults: ["art-run-test-defaults"],
diff --git a/test/583-checker-zero/Android.bp b/test/583-checker-zero/Android.bp
index 3f03c1c..4952dec 100644
--- a/test/583-checker-zero/Android.bp
+++ b/test/583-checker-zero/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `583-checker-zero`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-583-checker-zero",
     defaults: ["art-run-test-defaults"],
diff --git a/test/584-checker-div-bool/Android.bp b/test/584-checker-div-bool/Android.bp
index 5faec14..5e7f928 100644
--- a/test/584-checker-div-bool/Android.bp
+++ b/test/584-checker-div-bool/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `584-checker-div-bool`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-584-checker-div-bool",
     defaults: ["art-run-test-defaults"],
diff --git a/test/589-super-imt/Android.bp b/test/589-super-imt/Android.bp
index 550ee38..5a79bc9 100644
--- a/test/589-super-imt/Android.bp
+++ b/test/589-super-imt/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `589-super-imt`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-589-super-imt",
     defaults: ["art-run-test-defaults"],
diff --git a/test/590-checker-arr-set-null-regression/Android.bp b/test/590-checker-arr-set-null-regression/Android.bp
index d4a46cc..e42602a 100644
--- a/test/590-checker-arr-set-null-regression/Android.bp
+++ b/test/590-checker-arr-set-null-regression/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `590-checker-arr-set-null-regression`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-590-checker-arr-set-null-regression",
     defaults: ["art-run-test-defaults"],
diff --git a/test/591-checker-regression-dead-loop/Android.bp b/test/591-checker-regression-dead-loop/Android.bp
index 97593b2..b2138a8 100644
--- a/test/591-checker-regression-dead-loop/Android.bp
+++ b/test/591-checker-regression-dead-loop/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `591-checker-regression-dead-loop`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-591-checker-regression-dead-loop",
     defaults: ["art-run-test-defaults"],
diff --git a/test/593-checker-long-2-float-regression/Android.bp b/test/593-checker-long-2-float-regression/Android.bp
index b354164..bc5adc7 100644
--- a/test/593-checker-long-2-float-regression/Android.bp
+++ b/test/593-checker-long-2-float-regression/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `593-checker-long-2-float-regression`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-593-checker-long-2-float-regression",
     defaults: ["art-run-test-defaults"],
diff --git a/test/594-checker-array-alias/Android.bp b/test/594-checker-array-alias/Android.bp
index 104281e..82e5a88 100644
--- a/test/594-checker-array-alias/Android.bp
+++ b/test/594-checker-array-alias/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `594-checker-array-alias`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-594-checker-array-alias",
     defaults: ["art-run-test-defaults"],
diff --git a/test/594-load-string-regression/Android.bp b/test/594-load-string-regression/Android.bp
index a3c06f4..b1a8644 100644
--- a/test/594-load-string-regression/Android.bp
+++ b/test/594-load-string-regression/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `594-load-string-regression`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-594-load-string-regression",
     defaults: ["art-run-test-defaults"],
diff --git a/test/595-profile-saving/Android.bp b/test/595-profile-saving/Android.bp
index d2499aa..f062831 100644
--- a/test/595-profile-saving/Android.bp
+++ b/test/595-profile-saving/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `595-profile-saving`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-595-profile-saving",
     defaults: ["art-run-test-defaults"],
diff --git a/test/597-deopt-busy-loop/Android.bp b/test/597-deopt-busy-loop/Android.bp
index 210b10b..d1ee3f2 100644
--- a/test/597-deopt-busy-loop/Android.bp
+++ b/test/597-deopt-busy-loop/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `597-deopt-busy-loop`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-597-deopt-busy-loop",
     defaults: ["art-run-test-defaults"],
diff --git a/test/597-deopt-invoke-stub/Android.bp b/test/597-deopt-invoke-stub/Android.bp
index 952a8e6..c47c62c 100644
--- a/test/597-deopt-invoke-stub/Android.bp
+++ b/test/597-deopt-invoke-stub/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `597-deopt-invoke-stub`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-597-deopt-invoke-stub",
     defaults: ["art-run-test-defaults"],
diff --git a/test/597-deopt-new-string/Android.bp b/test/597-deopt-new-string/Android.bp
index fbf87ea..c3716f2 100644
--- a/test/597-deopt-new-string/Android.bp
+++ b/test/597-deopt-new-string/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `597-deopt-new-string`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-597-deopt-new-string",
     defaults: ["art-run-test-defaults"],
diff --git a/test/602-deoptimizeable/Android.bp b/test/602-deoptimizeable/Android.bp
index 15976ae..3aa61e5 100644
--- a/test/602-deoptimizeable/Android.bp
+++ b/test/602-deoptimizeable/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `602-deoptimizeable`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-602-deoptimizeable",
     defaults: ["art-run-test-defaults"],
diff --git a/test/603-checker-instanceof/Android.bp b/test/603-checker-instanceof/Android.bp
index a04a885..3fcc54d 100644
--- a/test/603-checker-instanceof/Android.bp
+++ b/test/603-checker-instanceof/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `603-checker-instanceof`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-603-checker-instanceof",
     defaults: ["art-run-test-defaults"],
diff --git a/test/604-hot-static-interface/Android.bp b/test/604-hot-static-interface/Android.bp
index e1a07b6..3657dc4 100644
--- a/test/604-hot-static-interface/Android.bp
+++ b/test/604-hot-static-interface/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `604-hot-static-interface`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-604-hot-static-interface",
     defaults: ["art-run-test-defaults"],
diff --git a/test/605-new-string-from-bytes/Android.bp b/test/605-new-string-from-bytes/Android.bp
index f5676d8..4bbfa10 100644
--- a/test/605-new-string-from-bytes/Android.bp
+++ b/test/605-new-string-from-bytes/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `605-new-string-from-bytes`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-605-new-string-from-bytes",
     defaults: ["art-run-test-defaults"],
diff --git a/test/607-daemon-stress/Android.bp b/test/607-daemon-stress/Android.bp
index eb797c6..083bd7c 100644
--- a/test/607-daemon-stress/Android.bp
+++ b/test/607-daemon-stress/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `607-daemon-stress`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-607-daemon-stress",
     defaults: ["art-run-test-defaults"],
diff --git a/test/609-checker-inline-interface/Android.bp b/test/609-checker-inline-interface/Android.bp
index df9804c..33c2cac 100644
--- a/test/609-checker-inline-interface/Android.bp
+++ b/test/609-checker-inline-interface/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `609-checker-inline-interface`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-609-checker-inline-interface",
     defaults: ["art-run-test-defaults"],
diff --git a/test/609-checker-x86-bounds-check/Android.bp b/test/609-checker-x86-bounds-check/Android.bp
index b08675a..81591bc 100644
--- a/test/609-checker-x86-bounds-check/Android.bp
+++ b/test/609-checker-x86-bounds-check/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `609-checker-x86-bounds-check`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-609-checker-x86-bounds-check",
     defaults: ["art-run-test-defaults"],
diff --git a/test/610-arraycopy/Android.bp b/test/610-arraycopy/Android.bp
index 9537632..c049136 100644
--- a/test/610-arraycopy/Android.bp
+++ b/test/610-arraycopy/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `610-arraycopy`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-610-arraycopy",
     defaults: ["art-run-test-defaults"],
diff --git a/test/611-checker-simplify-if/Android.bp b/test/611-checker-simplify-if/Android.bp
index 23b0bb1..7637af3 100644
--- a/test/611-checker-simplify-if/Android.bp
+++ b/test/611-checker-simplify-if/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `611-checker-simplify-if`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-611-checker-simplify-if",
     defaults: ["art-run-test-defaults"],
diff --git a/test/614-checker-dump-constant-location/Android.bp b/test/614-checker-dump-constant-location/Android.bp
index e1637fb..566bdae 100644
--- a/test/614-checker-dump-constant-location/Android.bp
+++ b/test/614-checker-dump-constant-location/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `614-checker-dump-constant-location`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-614-checker-dump-constant-location",
     defaults: ["art-run-test-defaults"],
diff --git a/test/615-checker-arm64-store-zero/Android.bp b/test/615-checker-arm64-store-zero/Android.bp
index 2cf5ac9..bd5acd9 100644
--- a/test/615-checker-arm64-store-zero/Android.bp
+++ b/test/615-checker-arm64-store-zero/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `615-checker-arm64-store-zero`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-615-checker-arm64-store-zero",
     defaults: ["art-run-test-defaults"],
diff --git a/test/616-cha-abstract/Android.bp b/test/616-cha-abstract/Android.bp
index 1d3f849..e681343 100644
--- a/test/616-cha-abstract/Android.bp
+++ b/test/616-cha-abstract/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `616-cha-abstract`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-616-cha-abstract",
     defaults: ["art-run-test-defaults"],
diff --git a/test/616-cha-interface/Android.bp b/test/616-cha-interface/Android.bp
index bc42cec..9cdb494 100644
--- a/test/616-cha-interface/Android.bp
+++ b/test/616-cha-interface/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `616-cha-interface`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-616-cha-interface",
     defaults: ["art-run-test-defaults"],
diff --git a/test/616-cha-miranda/Android.bp b/test/616-cha-miranda/Android.bp
index 3b97898..1acad4e 100644
--- a/test/616-cha-miranda/Android.bp
+++ b/test/616-cha-miranda/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `616-cha-miranda`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-616-cha-miranda",
     defaults: ["art-run-test-defaults"],
diff --git a/test/616-cha-native/Android.bp b/test/616-cha-native/Android.bp
index 8534877..af46ac7 100644
--- a/test/616-cha-native/Android.bp
+++ b/test/616-cha-native/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `616-cha-native`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-616-cha-native",
     defaults: ["art-run-test-defaults"],
diff --git a/test/616-cha-regression-proxy-method/Android.bp b/test/616-cha-regression-proxy-method/Android.bp
index db48c37..035abb1 100644
--- a/test/616-cha-regression-proxy-method/Android.bp
+++ b/test/616-cha-regression-proxy-method/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `616-cha-regression-proxy-method`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-616-cha-regression-proxy-method",
     defaults: ["art-run-test-defaults"],
diff --git a/test/616-cha/Android.bp b/test/616-cha/Android.bp
index 81efc45..e6cc2da 100644
--- a/test/616-cha/Android.bp
+++ b/test/616-cha/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `616-cha`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-616-cha",
     defaults: ["art-run-test-defaults"],
diff --git a/test/617-clinit-oome/Android.bp b/test/617-clinit-oome/Android.bp
index 378d8dd..a58c888 100644
--- a/test/617-clinit-oome/Android.bp
+++ b/test/617-clinit-oome/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `617-clinit-oome`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-617-clinit-oome",
     defaults: ["art-run-test-defaults"],
diff --git a/test/618-checker-induction/Android.bp b/test/618-checker-induction/Android.bp
index 4d72156..6d1a054 100644
--- a/test/618-checker-induction/Android.bp
+++ b/test/618-checker-induction/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `618-checker-induction`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-618-checker-induction",
     defaults: ["art-run-test-defaults"],
diff --git a/test/619-checker-current-method/Android.bp b/test/619-checker-current-method/Android.bp
index 5b2e32b..10e2d9a 100644
--- a/test/619-checker-current-method/Android.bp
+++ b/test/619-checker-current-method/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `619-checker-current-method`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-619-checker-current-method",
     defaults: ["art-run-test-defaults"],
diff --git a/test/620-checker-bce-intrinsics/Android.bp b/test/620-checker-bce-intrinsics/Android.bp
index 4d035ea..0014b03 100644
--- a/test/620-checker-bce-intrinsics/Android.bp
+++ b/test/620-checker-bce-intrinsics/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `620-checker-bce-intrinsics`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-620-checker-bce-intrinsics",
     defaults: ["art-run-test-defaults"],
diff --git a/test/622-checker-bce-regressions/Android.bp b/test/622-checker-bce-regressions/Android.bp
index 35c538e..b14a5a0 100644
--- a/test/622-checker-bce-regressions/Android.bp
+++ b/test/622-checker-bce-regressions/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `622-checker-bce-regressions`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-622-checker-bce-regressions",
     defaults: ["art-run-test-defaults"],
diff --git a/test/623-checker-loop-regressions/Android.bp b/test/623-checker-loop-regressions/Android.bp
index 6adf4c3..95521d6 100644
--- a/test/623-checker-loop-regressions/Android.bp
+++ b/test/623-checker-loop-regressions/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `623-checker-loop-regressions`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-623-checker-loop-regressions",
     defaults: ["art-run-test-defaults"],
diff --git a/test/625-checker-licm-regressions/Android.bp b/test/625-checker-licm-regressions/Android.bp
index c731cb1..95175b0 100644
--- a/test/625-checker-licm-regressions/Android.bp
+++ b/test/625-checker-licm-regressions/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `625-checker-licm-regressions`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-625-checker-licm-regressions",
     defaults: ["art-run-test-defaults"],
diff --git a/test/626-set-resolved-string/Android.bp b/test/626-set-resolved-string/Android.bp
index 91baa6d..dee4dde 100644
--- a/test/626-set-resolved-string/Android.bp
+++ b/test/626-set-resolved-string/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `626-set-resolved-string`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-626-set-resolved-string",
     defaults: ["art-run-test-defaults"],
diff --git a/test/627-checker-unroll/Android.bp b/test/627-checker-unroll/Android.bp
index ae90952..1c2baca 100644
--- a/test/627-checker-unroll/Android.bp
+++ b/test/627-checker-unroll/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `627-checker-unroll`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-627-checker-unroll",
     defaults: ["art-run-test-defaults"],
diff --git a/test/628-vdex/Android.bp b/test/628-vdex/Android.bp
index a8bc043..7b768fc 100644
--- a/test/628-vdex/Android.bp
+++ b/test/628-vdex/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `628-vdex`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-628-vdex",
     defaults: ["art-run-test-defaults"],
diff --git a/test/629-vdex-speed/Android.bp b/test/629-vdex-speed/Android.bp
index 9a8d3e5..00b00d8 100644
--- a/test/629-vdex-speed/Android.bp
+++ b/test/629-vdex-speed/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `629-vdex-speed`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-629-vdex-speed",
     defaults: ["art-run-test-defaults"],
diff --git a/test/631-checker-get-class/Android.bp b/test/631-checker-get-class/Android.bp
index 0332271..f08cfe0 100644
--- a/test/631-checker-get-class/Android.bp
+++ b/test/631-checker-get-class/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `631-checker-get-class`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-631-checker-get-class",
     defaults: ["art-run-test-defaults"],
diff --git a/test/632-checker-char-at-bounds/Android.bp b/test/632-checker-char-at-bounds/Android.bp
index a0637d9..d7f680a 100644
--- a/test/632-checker-char-at-bounds/Android.bp
+++ b/test/632-checker-char-at-bounds/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `632-checker-char-at-bounds`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-632-checker-char-at-bounds",
     defaults: ["art-run-test-defaults"],
diff --git a/test/635-checker-arm64-volatile-load-cc/Android.bp b/test/635-checker-arm64-volatile-load-cc/Android.bp
index d405474..253abb1 100644
--- a/test/635-checker-arm64-volatile-load-cc/Android.bp
+++ b/test/635-checker-arm64-volatile-load-cc/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `635-checker-arm64-volatile-load-cc`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-635-checker-arm64-volatile-load-cc",
     defaults: ["art-run-test-defaults"],
diff --git a/test/636-arm64-veneer-pool/Android.bp b/test/636-arm64-veneer-pool/Android.bp
index accc500..9d8f7cc 100644
--- a/test/636-arm64-veneer-pool/Android.bp
+++ b/test/636-arm64-veneer-pool/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `636-arm64-veneer-pool`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-636-arm64-veneer-pool",
     defaults: ["art-run-test-defaults"],
diff --git a/test/637-checker-throw-inline/Android.bp b/test/637-checker-throw-inline/Android.bp
index 20dd22f..f44e64b 100644
--- a/test/637-checker-throw-inline/Android.bp
+++ b/test/637-checker-throw-inline/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `637-checker-throw-inline`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-637-checker-throw-inline",
     defaults: ["art-run-test-defaults"],
diff --git a/test/638-checker-inline-cache-intrinsic/Android.bp b/test/638-checker-inline-cache-intrinsic/Android.bp
index 4690310..9040ce3 100644
--- a/test/638-checker-inline-cache-intrinsic/Android.bp
+++ b/test/638-checker-inline-cache-intrinsic/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `638-checker-inline-cache-intrinsic`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-638-checker-inline-cache-intrinsic",
     defaults: ["art-run-test-defaults"],
diff --git a/test/639-checker-code-sinking/Android.bp b/test/639-checker-code-sinking/Android.bp
index d57a2d7..9493934 100644
--- a/test/639-checker-code-sinking/Android.bp
+++ b/test/639-checker-code-sinking/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `639-checker-code-sinking`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-639-checker-code-sinking",
     defaults: ["art-run-test-defaults"],
diff --git a/test/640-checker-boolean-simd/Android.bp b/test/640-checker-boolean-simd/Android.bp
index 8913313..89e6ac7 100644
--- a/test/640-checker-boolean-simd/Android.bp
+++ b/test/640-checker-boolean-simd/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `640-checker-boolean-simd`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-640-checker-boolean-simd",
     defaults: ["art-run-test-defaults"],
diff --git a/test/640-checker-integer-valueof/Android.bp b/test/640-checker-integer-valueof/Android.bp
index c8f7e7a..aca0bb3 100644
--- a/test/640-checker-integer-valueof/Android.bp
+++ b/test/640-checker-integer-valueof/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `640-checker-integer-valueof`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-640-checker-integer-valueof",
     defaults: ["art-run-test-defaults"],
diff --git a/test/640-checker-simd/Android.bp b/test/640-checker-simd/Android.bp
index 3a9e601..45d0885 100644
--- a/test/640-checker-simd/Android.bp
+++ b/test/640-checker-simd/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `640-checker-simd`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-640-checker-simd",
     defaults: ["art-run-test-defaults"],
diff --git a/test/641-checker-arraycopy/Android.bp b/test/641-checker-arraycopy/Android.bp
index 1d45319..fabb0fe 100644
--- a/test/641-checker-arraycopy/Android.bp
+++ b/test/641-checker-arraycopy/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `641-checker-arraycopy`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-641-checker-arraycopy",
     defaults: ["art-run-test-defaults"],
diff --git a/test/641-iterations/Android.bp b/test/641-iterations/Android.bp
index 2b6b341..be127bb 100644
--- a/test/641-iterations/Android.bp
+++ b/test/641-iterations/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `641-iterations`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-641-iterations",
     defaults: ["art-run-test-defaults"],
diff --git a/test/642-fp-callees/Android.bp b/test/642-fp-callees/Android.bp
index 047e32fb8..0c7a886 100644
--- a/test/642-fp-callees/Android.bp
+++ b/test/642-fp-callees/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `642-fp-callees`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-642-fp-callees",
     defaults: ["art-run-test-defaults"],
diff --git a/test/643-checker-bogus-ic/Android.bp b/test/643-checker-bogus-ic/Android.bp
index 31e703a..ee2b7dc 100644
--- a/test/643-checker-bogus-ic/Android.bp
+++ b/test/643-checker-bogus-ic/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `643-checker-bogus-ic`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-643-checker-bogus-ic",
     defaults: ["art-run-test-defaults"],
diff --git a/test/645-checker-abs-simd/Android.bp b/test/645-checker-abs-simd/Android.bp
index 13b437e..bf29f92 100644
--- a/test/645-checker-abs-simd/Android.bp
+++ b/test/645-checker-abs-simd/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `645-checker-abs-simd`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-645-checker-abs-simd",
     defaults: ["art-run-test-defaults"],
diff --git a/test/646-checker-arraycopy-large-cst-pos/Android.bp b/test/646-checker-arraycopy-large-cst-pos/Android.bp
index 7220655..983c9df 100644
--- a/test/646-checker-arraycopy-large-cst-pos/Android.bp
+++ b/test/646-checker-arraycopy-large-cst-pos/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `646-checker-arraycopy-large-cst-pos`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-646-checker-arraycopy-large-cst-pos",
     defaults: ["art-run-test-defaults"],
diff --git a/test/646-checker-long-const-to-int/Android.bp b/test/646-checker-long-const-to-int/Android.bp
index cb7bd90..be5cf75 100644
--- a/test/646-checker-long-const-to-int/Android.bp
+++ b/test/646-checker-long-const-to-int/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `646-checker-long-const-to-int`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-646-checker-long-const-to-int",
     defaults: ["art-run-test-defaults"],
diff --git a/test/646-checker-simd-hadd/Android.bp b/test/646-checker-simd-hadd/Android.bp
index 3cf6a47..12df43d 100644
--- a/test/646-checker-simd-hadd/Android.bp
+++ b/test/646-checker-simd-hadd/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `646-checker-simd-hadd`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-646-checker-simd-hadd",
     defaults: ["art-run-test-defaults"],
diff --git a/test/647-jni-get-field-id/Android.bp b/test/647-jni-get-field-id/Android.bp
index 111d926..f3bb8a5 100644
--- a/test/647-jni-get-field-id/Android.bp
+++ b/test/647-jni-get-field-id/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `647-jni-get-field-id`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-647-jni-get-field-id",
     defaults: ["art-run-test-defaults"],
diff --git a/test/650-checker-inline-access-thunks/Android.bp b/test/650-checker-inline-access-thunks/Android.bp
index d44a735..2b98cce 100644
--- a/test/650-checker-inline-access-thunks/Android.bp
+++ b/test/650-checker-inline-access-thunks/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `650-checker-inline-access-thunks`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-650-checker-inline-access-thunks",
     defaults: ["art-run-test-defaults"],
diff --git a/test/652-deopt-intrinsic/Android.bp b/test/652-deopt-intrinsic/Android.bp
index 958eab9..53f406a 100644
--- a/test/652-deopt-intrinsic/Android.bp
+++ b/test/652-deopt-intrinsic/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `652-deopt-intrinsic`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-652-deopt-intrinsic",
     defaults: ["art-run-test-defaults"],
diff --git a/test/654-checker-periodic/Android.bp b/test/654-checker-periodic/Android.bp
index 3dfc049..79e38bb 100644
--- a/test/654-checker-periodic/Android.bp
+++ b/test/654-checker-periodic/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `654-checker-periodic`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-654-checker-periodic",
     defaults: ["art-run-test-defaults"],
diff --git a/test/655-checker-simd-arm-opt/Android.bp b/test/655-checker-simd-arm-opt/Android.bp
index a4c4209..50f18fe 100644
--- a/test/655-checker-simd-arm-opt/Android.bp
+++ b/test/655-checker-simd-arm-opt/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `655-checker-simd-arm-opt`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-655-checker-simd-arm-opt",
     defaults: ["art-run-test-defaults"],
diff --git a/test/655-jit-clinit/Android.bp b/test/655-jit-clinit/Android.bp
index aa3f3f2..00e3365 100644
--- a/test/655-jit-clinit/Android.bp
+++ b/test/655-jit-clinit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `655-jit-clinit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-655-jit-clinit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/656-checker-simd-opt/Android.bp b/test/656-checker-simd-opt/Android.bp
index 56c62fb..2b72352 100644
--- a/test/656-checker-simd-opt/Android.bp
+++ b/test/656-checker-simd-opt/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `656-checker-simd-opt`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-656-checker-simd-opt",
     defaults: ["art-run-test-defaults"],
diff --git a/test/656-loop-deopt/Android.bp b/test/656-loop-deopt/Android.bp
index 89a64e6..3ca3822 100644
--- a/test/656-loop-deopt/Android.bp
+++ b/test/656-loop-deopt/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `656-loop-deopt`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-656-loop-deopt",
     defaults: ["art-run-test-defaults"],
diff --git a/test/657-branches/Android.bp b/test/657-branches/Android.bp
index 5c89ba5..70c422f 100644
--- a/test/657-branches/Android.bp
+++ b/test/657-branches/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `657-branches`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-657-branches",
     defaults: ["art-run-test-defaults"],
diff --git a/test/658-fp-read-barrier/Android.bp b/test/658-fp-read-barrier/Android.bp
index 83fef81..fdb2b35 100644
--- a/test/658-fp-read-barrier/Android.bp
+++ b/test/658-fp-read-barrier/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `658-fp-read-barrier`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-658-fp-read-barrier",
     defaults: ["art-run-test-defaults"],
diff --git a/test/660-checker-sad/Android.bp b/test/660-checker-sad/Android.bp
index a4ef5c7..76b8c7b 100644
--- a/test/660-checker-sad/Android.bp
+++ b/test/660-checker-sad/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `660-checker-sad`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-660-checker-sad",
     defaults: ["art-run-test-defaults"],
diff --git a/test/660-checker-simd-sad/Android.bp b/test/660-checker-simd-sad/Android.bp
index 157b671..f751904 100644
--- a/test/660-checker-simd-sad/Android.bp
+++ b/test/660-checker-simd-sad/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `660-checker-simd-sad`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-660-checker-simd-sad",
     defaults: ["art-run-test-defaults"],
diff --git a/test/660-clinit/Android.bp b/test/660-clinit/Android.bp
index 091bfce..9ccd82d 100644
--- a/test/660-clinit/Android.bp
+++ b/test/660-clinit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `660-clinit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-660-clinit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/661-checker-simd-reduc/Android.bp b/test/661-checker-simd-reduc/Android.bp
index 331c060..65e00c7 100644
--- a/test/661-checker-simd-reduc/Android.bp
+++ b/test/661-checker-simd-reduc/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `661-checker-simd-reduc`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-661-checker-simd-reduc",
     defaults: ["art-run-test-defaults"],
diff --git a/test/661-oat-writer-layout/Android.bp b/test/661-oat-writer-layout/Android.bp
index e2f0ff5..51e1cdd 100644
--- a/test/661-oat-writer-layout/Android.bp
+++ b/test/661-oat-writer-layout/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `661-oat-writer-layout`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-661-oat-writer-layout",
     defaults: ["art-run-test-defaults"],
diff --git a/test/662-regression-alias/Android.bp b/test/662-regression-alias/Android.bp
index 2cbb9db..7d38415 100644
--- a/test/662-regression-alias/Android.bp
+++ b/test/662-regression-alias/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `662-regression-alias`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-662-regression-alias",
     defaults: ["art-run-test-defaults"],
diff --git a/test/664-aget-verifier/Android.bp b/test/664-aget-verifier/Android.bp
index 2fe9a70..9d54a59 100644
--- a/test/664-aget-verifier/Android.bp
+++ b/test/664-aget-verifier/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `664-aget-verifier`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-664-aget-verifier",
     defaults: ["art-run-test-defaults"],
diff --git a/test/665-checker-simd-zero/Android.bp b/test/665-checker-simd-zero/Android.bp
index e1a8dbc..23e9f09 100644
--- a/test/665-checker-simd-zero/Android.bp
+++ b/test/665-checker-simd-zero/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `665-checker-simd-zero`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-665-checker-simd-zero",
     defaults: ["art-run-test-defaults"],
diff --git a/test/666-dex-cache-itf/Android.bp b/test/666-dex-cache-itf/Android.bp
index ce09705..f7f27f6 100644
--- a/test/666-dex-cache-itf/Android.bp
+++ b/test/666-dex-cache-itf/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `666-dex-cache-itf`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-666-dex-cache-itf",
     defaults: ["art-run-test-defaults"],
diff --git a/test/667-checker-simd-alignment/Android.bp b/test/667-checker-simd-alignment/Android.bp
index 697a9de..0426aac 100644
--- a/test/667-checker-simd-alignment/Android.bp
+++ b/test/667-checker-simd-alignment/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `667-checker-simd-alignment`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-667-checker-simd-alignment",
     defaults: ["art-run-test-defaults"],
diff --git a/test/667-jit-jni-stub/Android.bp b/test/667-jit-jni-stub/Android.bp
index ce4cede..2328e52 100644
--- a/test/667-jit-jni-stub/Android.bp
+++ b/test/667-jit-jni-stub/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `667-jit-jni-stub`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-667-jit-jni-stub",
     defaults: ["art-run-test-defaults"],
diff --git a/test/667-out-of-bounds/Android.bp b/test/667-out-of-bounds/Android.bp
index cf43746..9718596 100644
--- a/test/667-out-of-bounds/Android.bp
+++ b/test/667-out-of-bounds/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `667-out-of-bounds`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-667-out-of-bounds",
     defaults: ["art-run-test-defaults"],
diff --git a/test/669-checker-break/Android.bp b/test/669-checker-break/Android.bp
index a75fe6b..0eb41a2 100644
--- a/test/669-checker-break/Android.bp
+++ b/test/669-checker-break/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `669-checker-break`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-669-checker-break",
     defaults: ["art-run-test-defaults"],
diff --git a/test/671-npe-field-opts/Android.bp b/test/671-npe-field-opts/Android.bp
index 8663408..4fbdd96 100644
--- a/test/671-npe-field-opts/Android.bp
+++ b/test/671-npe-field-opts/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `671-npe-field-opts`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-671-npe-field-opts",
     defaults: ["art-run-test-defaults"],
diff --git a/test/672-checker-throw-method/Android.bp b/test/672-checker-throw-method/Android.bp
index b567655..612b37f 100644
--- a/test/672-checker-throw-method/Android.bp
+++ b/test/672-checker-throw-method/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `672-checker-throw-method`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-672-checker-throw-method",
     defaults: ["art-run-test-defaults"],
diff --git a/test/673-checker-throw-vmethod/Android.bp b/test/673-checker-throw-vmethod/Android.bp
index 43cc4ce..bfbccc4 100644
--- a/test/673-checker-throw-vmethod/Android.bp
+++ b/test/673-checker-throw-vmethod/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `673-checker-throw-vmethod`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-673-checker-throw-vmethod",
     defaults: ["art-run-test-defaults"],
diff --git a/test/674-HelloWorld-Dm/Android.bp b/test/674-HelloWorld-Dm/Android.bp
index d50f981..3c55af7 100644
--- a/test/674-HelloWorld-Dm/Android.bp
+++ b/test/674-HelloWorld-Dm/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `674-HelloWorld-Dm`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-674-HelloWorld-Dm",
     defaults: ["art-run-test-defaults"],
diff --git a/test/674-hotness-compiled/Android.bp b/test/674-hotness-compiled/Android.bp
index 638c264..c11bc72 100644
--- a/test/674-hotness-compiled/Android.bp
+++ b/test/674-hotness-compiled/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `674-hotness-compiled`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-674-hotness-compiled",
     defaults: ["art-run-test-defaults"],
diff --git a/test/676-proxy-jit-at-first-use/Android.bp b/test/676-proxy-jit-at-first-use/Android.bp
index 571ee9b..f8ab7bb 100644
--- a/test/676-proxy-jit-at-first-use/Android.bp
+++ b/test/676-proxy-jit-at-first-use/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `676-proxy-jit-at-first-use`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-676-proxy-jit-at-first-use",
     defaults: ["art-run-test-defaults"],
diff --git a/test/677-fsi2/Android.bp b/test/677-fsi2/Android.bp
index da7eca5..c95c227 100644
--- a/test/677-fsi2/Android.bp
+++ b/test/677-fsi2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `677-fsi2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-677-fsi2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/679-locks/Android.bp b/test/679-locks/Android.bp
index 3fa9677..38b9c96 100644
--- a/test/679-locks/Android.bp
+++ b/test/679-locks/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `679-locks`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-679-locks",
     defaults: ["art-run-test-defaults"],
diff --git a/test/680-checker-deopt-dex-pc-0/Android.bp b/test/680-checker-deopt-dex-pc-0/Android.bp
index 80aa879..a198d26 100644
--- a/test/680-checker-deopt-dex-pc-0/Android.bp
+++ b/test/680-checker-deopt-dex-pc-0/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `680-checker-deopt-dex-pc-0`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-680-checker-deopt-dex-pc-0",
     defaults: ["art-run-test-defaults"],
diff --git a/test/680-sink-regression/Android.bp b/test/680-sink-regression/Android.bp
index 676bc2f..f55b8ae 100644
--- a/test/680-sink-regression/Android.bp
+++ b/test/680-sink-regression/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `680-sink-regression`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-680-sink-regression",
     defaults: ["art-run-test-defaults"],
diff --git a/test/684-checker-simd-dotprod/Android.bp b/test/684-checker-simd-dotprod/Android.bp
index 2f219a3..1410e91 100644
--- a/test/684-checker-simd-dotprod/Android.bp
+++ b/test/684-checker-simd-dotprod/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `684-checker-simd-dotprod`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-684-checker-simd-dotprod",
     defaults: ["art-run-test-defaults"],
diff --git a/test/684-select-condition/Android.bp b/test/684-select-condition/Android.bp
index ee6db88..4360d5d 100644
--- a/test/684-select-condition/Android.bp
+++ b/test/684-select-condition/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `684-select-condition`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-684-select-condition",
     defaults: ["art-run-test-defaults"],
diff --git a/test/685-deoptimizeable/Android.bp b/test/685-deoptimizeable/Android.bp
index 2e10a83..c02392c 100644
--- a/test/685-deoptimizeable/Android.bp
+++ b/test/685-deoptimizeable/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `685-deoptimizeable`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-685-deoptimizeable",
     defaults: ["art-run-test-defaults"],
diff --git a/test/687-deopt/Android.bp b/test/687-deopt/Android.bp
index 0c66962..42054c9 100644
--- a/test/687-deopt/Android.bp
+++ b/test/687-deopt/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `687-deopt`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-687-deopt",
     defaults: ["art-run-test-defaults"],
diff --git a/test/689-multi-catch/Android.bp b/test/689-multi-catch/Android.bp
index c1930cc..3dbf0fb 100644
--- a/test/689-multi-catch/Android.bp
+++ b/test/689-multi-catch/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `689-multi-catch`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-689-multi-catch",
     defaults: ["art-run-test-defaults"],
diff --git a/test/689-zygote-jit-deopt/Android.bp b/test/689-zygote-jit-deopt/Android.bp
index 688ff0a..0abbea7 100644
--- a/test/689-zygote-jit-deopt/Android.bp
+++ b/test/689-zygote-jit-deopt/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `689-zygote-jit-deopt`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-689-zygote-jit-deopt",
     defaults: ["art-run-test-defaults"],
diff --git a/test/693-vdex-inmem-loader-evict/Android.bp b/test/693-vdex-inmem-loader-evict/Android.bp
index 5c522d6..ffc72cd 100644
--- a/test/693-vdex-inmem-loader-evict/Android.bp
+++ b/test/693-vdex-inmem-loader-evict/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `693-vdex-inmem-loader-evict`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-693-vdex-inmem-loader-evict",
     defaults: ["art-run-test-defaults"],
diff --git a/test/694-clinit-jit/Android.bp b/test/694-clinit-jit/Android.bp
index 8da4e14..2f25ec0 100644
--- a/test/694-clinit-jit/Android.bp
+++ b/test/694-clinit-jit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `694-clinit-jit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-694-clinit-jit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/695-simplify-throws/Android.bp b/test/695-simplify-throws/Android.bp
index e8c826f..d6d7c7c 100644
--- a/test/695-simplify-throws/Android.bp
+++ b/test/695-simplify-throws/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `695-simplify-throws`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-695-simplify-throws",
     defaults: ["art-run-test-defaults"],
diff --git a/test/696-loop/Android.bp b/test/696-loop/Android.bp
index a7a1ab2..b39271f 100644
--- a/test/696-loop/Android.bp
+++ b/test/696-loop/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `696-loop`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-696-loop",
     defaults: ["art-run-test-defaults"],
diff --git a/test/697-checker-string-append/Android.bp b/test/697-checker-string-append/Android.bp
index d385da8..767e970 100644
--- a/test/697-checker-string-append/Android.bp
+++ b/test/697-checker-string-append/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `697-checker-string-append`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-697-checker-string-append",
     defaults: ["art-run-test-defaults"],
diff --git a/test/698-selects/Android.bp b/test/698-selects/Android.bp
index 385b9f3..a3be249 100644
--- a/test/698-selects/Android.bp
+++ b/test/698-selects/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `698-selects`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-698-selects",
     defaults: ["art-run-test-defaults"],
diff --git a/test/700-LoadArgRegs/Android.bp b/test/700-LoadArgRegs/Android.bp
index f57bc45..bbaa28d 100644
--- a/test/700-LoadArgRegs/Android.bp
+++ b/test/700-LoadArgRegs/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `700-LoadArgRegs`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-700-LoadArgRegs",
     defaults: ["art-run-test-defaults"],
diff --git a/test/703-floating-point-div/Android.bp b/test/703-floating-point-div/Android.bp
index c1c9e5d..42ae166 100644
--- a/test/703-floating-point-div/Android.bp
+++ b/test/703-floating-point-div/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `703-floating-point-div`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-703-floating-point-div",
     defaults: ["art-run-test-defaults"],
diff --git a/test/704-multiply-accumulate/Android.bp b/test/704-multiply-accumulate/Android.bp
index 190736f..3cd5ba1 100644
--- a/test/704-multiply-accumulate/Android.bp
+++ b/test/704-multiply-accumulate/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `704-multiply-accumulate`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-704-multiply-accumulate",
     defaults: ["art-run-test-defaults"],
diff --git a/test/705-register-conflict/Android.bp b/test/705-register-conflict/Android.bp
index 6fafed1..6182c2f 100644
--- a/test/705-register-conflict/Android.bp
+++ b/test/705-register-conflict/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `705-register-conflict`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-705-register-conflict",
     defaults: ["art-run-test-defaults"],
diff --git a/test/707-checker-invalid-profile/Android.bp b/test/707-checker-invalid-profile/Android.bp
index 5dee40f..8d813cc 100644
--- a/test/707-checker-invalid-profile/Android.bp
+++ b/test/707-checker-invalid-profile/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `707-checker-invalid-profile`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-707-checker-invalid-profile",
     defaults: ["art-run-test-defaults"],
diff --git a/test/708-jit-cache-churn/Android.bp b/test/708-jit-cache-churn/Android.bp
index 11f75e9..883983f 100644
--- a/test/708-jit-cache-churn/Android.bp
+++ b/test/708-jit-cache-churn/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `708-jit-cache-churn`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-708-jit-cache-churn",
     defaults: ["art-run-test-defaults"],
diff --git a/test/711-checker-type-conversion/Android.bp b/test/711-checker-type-conversion/Android.bp
index f5ce2d8..f9ae9d0 100644
--- a/test/711-checker-type-conversion/Android.bp
+++ b/test/711-checker-type-conversion/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `711-checker-type-conversion`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-711-checker-type-conversion",
     defaults: ["art-run-test-defaults"],
diff --git a/test/717-integer-value-of/Android.bp b/test/717-integer-value-of/Android.bp
index 6b01eeb..03d3ac3 100644
--- a/test/717-integer-value-of/Android.bp
+++ b/test/717-integer-value-of/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `717-integer-value-of`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-717-integer-value-of",
     defaults: ["art-run-test-defaults"],
diff --git a/test/718-zipfile-finalizer/Android.bp b/test/718-zipfile-finalizer/Android.bp
index 95044b5..ed1dc66 100644
--- a/test/718-zipfile-finalizer/Android.bp
+++ b/test/718-zipfile-finalizer/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `718-zipfile-finalizer`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-718-zipfile-finalizer",
     defaults: ["art-run-test-defaults"],
diff --git a/test/720-thread-priority/Android.bp b/test/720-thread-priority/Android.bp
index edfb94a..3a53717 100644
--- a/test/720-thread-priority/Android.bp
+++ b/test/720-thread-priority/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `720-thread-priority`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-720-thread-priority",
     defaults: ["art-run-test-defaults"],
diff --git a/test/721-osr/Android.bp b/test/721-osr/Android.bp
index 79396f5..22aa0c3 100644
--- a/test/721-osr/Android.bp
+++ b/test/721-osr/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `721-osr`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-721-osr",
     defaults: ["art-run-test-defaults"],
diff --git a/test/726-array-store/Android.bp b/test/726-array-store/Android.bp
index 5d3fe94..dc6cc24 100644
--- a/test/726-array-store/Android.bp
+++ b/test/726-array-store/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `726-array-store`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-726-array-store",
     defaults: ["art-run-test-defaults"],
diff --git a/test/728-imt-conflict-zygote/Android.bp b/test/728-imt-conflict-zygote/Android.bp
index ffa3d22..aaa145c 100644
--- a/test/728-imt-conflict-zygote/Android.bp
+++ b/test/728-imt-conflict-zygote/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `728-imt-conflict-zygote`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-728-imt-conflict-zygote",
     defaults: ["art-run-test-defaults"],
diff --git a/test/805-TooDeepClassInstanceOf/Android.bp b/test/805-TooDeepClassInstanceOf/Android.bp
index 4cf5f07..878f126 100644
--- a/test/805-TooDeepClassInstanceOf/Android.bp
+++ b/test/805-TooDeepClassInstanceOf/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `805-TooDeepClassInstanceOf`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-805-TooDeepClassInstanceOf",
     defaults: ["art-run-test-defaults"],
diff --git a/test/806-TooWideClassInstanceOf/Android.bp b/test/806-TooWideClassInstanceOf/Android.bp
index 72c02e6..bdff812 100644
--- a/test/806-TooWideClassInstanceOf/Android.bp
+++ b/test/806-TooWideClassInstanceOf/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `806-TooWideClassInstanceOf`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-806-TooWideClassInstanceOf",
     defaults: ["art-run-test-defaults"],
diff --git a/test/812-recursive-default/Android.bp b/test/812-recursive-default/Android.bp
index fdd789a..9c2fe2c 100644
--- a/test/812-recursive-default/Android.bp
+++ b/test/812-recursive-default/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `812-recursive-default`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-812-recursive-default",
     defaults: ["art-run-test-defaults"],
diff --git a/test/813-fp-args/Android.bp b/test/813-fp-args/Android.bp
index 199c318..5df0f42 100644
--- a/test/813-fp-args/Android.bp
+++ b/test/813-fp-args/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `813-fp-args`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-813-fp-args",
     defaults: ["art-run-test-defaults"],
diff --git a/test/814-large-field-offsets/Android.bp b/test/814-large-field-offsets/Android.bp
index 910ae23..e3193a8 100644
--- a/test/814-large-field-offsets/Android.bp
+++ b/test/814-large-field-offsets/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `814-large-field-offsets`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-814-large-field-offsets",
     defaults: ["art-run-test-defaults"],
diff --git a/test/815-invokeinterface-default/Android.bp b/test/815-invokeinterface-default/Android.bp
index be15be5..9981b02 100644
--- a/test/815-invokeinterface-default/Android.bp
+++ b/test/815-invokeinterface-default/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `815-invokeinterface-default`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-815-invokeinterface-default",
     defaults: ["art-run-test-defaults"],
diff --git a/test/818-clinit-nterp/Android.bp b/test/818-clinit-nterp/Android.bp
index e605f76..f168de3 100644
--- a/test/818-clinit-nterp/Android.bp
+++ b/test/818-clinit-nterp/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `818-clinit-nterp`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-818-clinit-nterp",
     defaults: ["art-run-test-defaults"],
diff --git a/test/900-hello-plugin/Android.bp b/test/900-hello-plugin/Android.bp
index 663b2b4..1bae532 100644
--- a/test/900-hello-plugin/Android.bp
+++ b/test/900-hello-plugin/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `900-hello-plugin`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-900-hello-plugin",
     defaults: ["art-run-test-defaults"],
diff --git a/test/901-hello-ti-agent/Android.bp b/test/901-hello-ti-agent/Android.bp
index d3ef796..65e4454 100644
--- a/test/901-hello-ti-agent/Android.bp
+++ b/test/901-hello-ti-agent/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `901-hello-ti-agent`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-901-hello-ti-agent",
     defaults: ["art-run-test-defaults"],
diff --git a/test/902-hello-transformation/Android.bp b/test/902-hello-transformation/Android.bp
index afab201..042e09e 100644
--- a/test/902-hello-transformation/Android.bp
+++ b/test/902-hello-transformation/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `902-hello-transformation`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-902-hello-transformation",
     defaults: ["art-run-test-defaults"],
diff --git a/test/903-hello-tagging/Android.bp b/test/903-hello-tagging/Android.bp
index b37328a..fe395dc 100644
--- a/test/903-hello-tagging/Android.bp
+++ b/test/903-hello-tagging/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `903-hello-tagging`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-903-hello-tagging",
     defaults: ["art-run-test-defaults"],
diff --git a/test/904-object-allocation/Android.bp b/test/904-object-allocation/Android.bp
index d3c1848..54d2e45 100644
--- a/test/904-object-allocation/Android.bp
+++ b/test/904-object-allocation/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `904-object-allocation`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-904-object-allocation",
     defaults: ["art-run-test-defaults"],
diff --git a/test/905-object-free/Android.bp b/test/905-object-free/Android.bp
index a57ce12..798274f 100644
--- a/test/905-object-free/Android.bp
+++ b/test/905-object-free/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `905-object-free`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-905-object-free",
     defaults: ["art-run-test-defaults"],
diff --git a/test/906-iterate-heap/Android.bp b/test/906-iterate-heap/Android.bp
index 15a6dc8..d61ed65 100644
--- a/test/906-iterate-heap/Android.bp
+++ b/test/906-iterate-heap/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `906-iterate-heap`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-906-iterate-heap",
     defaults: ["art-run-test-defaults"],
diff --git a/test/907-get-loaded-classes/Android.bp b/test/907-get-loaded-classes/Android.bp
index 63110f3..614a30f 100644
--- a/test/907-get-loaded-classes/Android.bp
+++ b/test/907-get-loaded-classes/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `907-get-loaded-classes`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-907-get-loaded-classes",
     defaults: ["art-run-test-defaults"],
diff --git a/test/908-gc-start-finish/Android.bp b/test/908-gc-start-finish/Android.bp
index 34dbad9..7aa75ff 100644
--- a/test/908-gc-start-finish/Android.bp
+++ b/test/908-gc-start-finish/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `908-gc-start-finish`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-908-gc-start-finish",
     defaults: ["art-run-test-defaults"],
diff --git a/test/910-methods/Android.bp b/test/910-methods/Android.bp
index 4107878..5832d12 100644
--- a/test/910-methods/Android.bp
+++ b/test/910-methods/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `910-methods`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-910-methods",
     defaults: ["art-run-test-defaults"],
diff --git a/test/911-get-stack-trace/Android.bp b/test/911-get-stack-trace/Android.bp
index f890c0a..c798eea 100644
--- a/test/911-get-stack-trace/Android.bp
+++ b/test/911-get-stack-trace/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `911-get-stack-trace`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-911-get-stack-trace",
     defaults: ["art-run-test-defaults"],
diff --git a/test/913-heaps/Android.bp b/test/913-heaps/Android.bp
index bae87f5f..9749b30 100644
--- a/test/913-heaps/Android.bp
+++ b/test/913-heaps/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `913-heaps`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-913-heaps",
     defaults: ["art-run-test-defaults"],
diff --git a/test/914-hello-obsolescence/Android.bp b/test/914-hello-obsolescence/Android.bp
index 5a82a64..bb8ffb4 100644
--- a/test/914-hello-obsolescence/Android.bp
+++ b/test/914-hello-obsolescence/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `914-hello-obsolescence`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-914-hello-obsolescence",
     defaults: ["art-run-test-defaults"],
diff --git a/test/915-obsolete-2/Android.bp b/test/915-obsolete-2/Android.bp
index 9eab799..b3216f0 100644
--- a/test/915-obsolete-2/Android.bp
+++ b/test/915-obsolete-2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `915-obsolete-2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-915-obsolete-2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/916-obsolete-jit/Android.bp b/test/916-obsolete-jit/Android.bp
index 5b84009..c5ed6e1 100644
--- a/test/916-obsolete-jit/Android.bp
+++ b/test/916-obsolete-jit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `916-obsolete-jit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-916-obsolete-jit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/917-fields-transformation/Android.bp b/test/917-fields-transformation/Android.bp
index ab519ee..41b1b63 100644
--- a/test/917-fields-transformation/Android.bp
+++ b/test/917-fields-transformation/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `917-fields-transformation`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-917-fields-transformation",
     defaults: ["art-run-test-defaults"],
diff --git a/test/918-fields/Android.bp b/test/918-fields/Android.bp
index ed5e294..98beeda 100644
--- a/test/918-fields/Android.bp
+++ b/test/918-fields/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `918-fields`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-918-fields",
     defaults: ["art-run-test-defaults"],
diff --git a/test/919-obsolete-fields/Android.bp b/test/919-obsolete-fields/Android.bp
index a8ae7fa..f0ecc8f 100644
--- a/test/919-obsolete-fields/Android.bp
+++ b/test/919-obsolete-fields/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `919-obsolete-fields`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-919-obsolete-fields",
     defaults: ["art-run-test-defaults"],
diff --git a/test/920-objects/Android.bp b/test/920-objects/Android.bp
index 4b41181..570c753 100644
--- a/test/920-objects/Android.bp
+++ b/test/920-objects/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `920-objects`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-920-objects",
     defaults: ["art-run-test-defaults"],
diff --git a/test/921-hello-failure/Android.bp b/test/921-hello-failure/Android.bp
index a3aa727..9776ac2 100644
--- a/test/921-hello-failure/Android.bp
+++ b/test/921-hello-failure/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `921-hello-failure`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-921-hello-failure",
     defaults: ["art-run-test-defaults"],
diff --git a/test/922-properties/Android.bp b/test/922-properties/Android.bp
index a1046a9..dc54fef 100644
--- a/test/922-properties/Android.bp
+++ b/test/922-properties/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `922-properties`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-922-properties",
     defaults: ["art-run-test-defaults"],
diff --git a/test/923-monitors/Android.bp b/test/923-monitors/Android.bp
index 8af0f7a..8d3e8ff 100644
--- a/test/923-monitors/Android.bp
+++ b/test/923-monitors/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `923-monitors`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-923-monitors",
     defaults: ["art-run-test-defaults"],
diff --git a/test/924-threads/Android.bp b/test/924-threads/Android.bp
index 00e3b64..f46122d 100644
--- a/test/924-threads/Android.bp
+++ b/test/924-threads/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `924-threads`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-924-threads",
     defaults: ["art-run-test-defaults"],
diff --git a/test/925-threadgroups/Android.bp b/test/925-threadgroups/Android.bp
index d978975..71429bd 100644
--- a/test/925-threadgroups/Android.bp
+++ b/test/925-threadgroups/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `925-threadgroups`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-925-threadgroups",
     defaults: ["art-run-test-defaults"],
diff --git a/test/926-multi-obsolescence/Android.bp b/test/926-multi-obsolescence/Android.bp
index c6808e8..1040bf5 100644
--- a/test/926-multi-obsolescence/Android.bp
+++ b/test/926-multi-obsolescence/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `926-multi-obsolescence`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-926-multi-obsolescence",
     defaults: ["art-run-test-defaults"],
diff --git a/test/927-timers/Android.bp b/test/927-timers/Android.bp
index d0e15f9..7265bb8 100644
--- a/test/927-timers/Android.bp
+++ b/test/927-timers/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `927-timers`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-927-timers",
     defaults: ["art-run-test-defaults"],
diff --git a/test/928-jni-table/Android.bp b/test/928-jni-table/Android.bp
index 0228c82..272c5e9 100644
--- a/test/928-jni-table/Android.bp
+++ b/test/928-jni-table/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `928-jni-table`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-928-jni-table",
     defaults: ["art-run-test-defaults"],
diff --git a/test/930-hello-retransform/Android.bp b/test/930-hello-retransform/Android.bp
index c607ccb..de0e25c 100644
--- a/test/930-hello-retransform/Android.bp
+++ b/test/930-hello-retransform/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `930-hello-retransform`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-930-hello-retransform",
     defaults: ["art-run-test-defaults"],
diff --git a/test/931-agent-thread/Android.bp b/test/931-agent-thread/Android.bp
index 21270b9..31ef9ca 100644
--- a/test/931-agent-thread/Android.bp
+++ b/test/931-agent-thread/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `931-agent-thread`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-931-agent-thread",
     defaults: ["art-run-test-defaults"],
diff --git a/test/932-transform-saves/Android.bp b/test/932-transform-saves/Android.bp
index 450ef6c..5b3b215 100644
--- a/test/932-transform-saves/Android.bp
+++ b/test/932-transform-saves/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `932-transform-saves`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-932-transform-saves",
     defaults: ["art-run-test-defaults"],
diff --git a/test/933-misc-events/Android.bp b/test/933-misc-events/Android.bp
index ec6109b..abc5fbf 100644
--- a/test/933-misc-events/Android.bp
+++ b/test/933-misc-events/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `933-misc-events`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-933-misc-events",
     defaults: ["art-run-test-defaults"],
diff --git a/test/937-hello-retransform-package/Android.bp b/test/937-hello-retransform-package/Android.bp
index cb0bfce..10ebdf4 100644
--- a/test/937-hello-retransform-package/Android.bp
+++ b/test/937-hello-retransform-package/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `937-hello-retransform-package`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-937-hello-retransform-package",
     defaults: ["art-run-test-defaults"],
diff --git a/test/939-hello-transformation-bcp/Android.bp b/test/939-hello-transformation-bcp/Android.bp
index 46c9fe2..98fa0dc 100644
--- a/test/939-hello-transformation-bcp/Android.bp
+++ b/test/939-hello-transformation-bcp/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `939-hello-transformation-bcp`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-939-hello-transformation-bcp",
     defaults: ["art-run-test-defaults"],
diff --git a/test/940-recursive-obsolete/Android.bp b/test/940-recursive-obsolete/Android.bp
index 2c4f341..19a6732 100644
--- a/test/940-recursive-obsolete/Android.bp
+++ b/test/940-recursive-obsolete/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `940-recursive-obsolete`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-940-recursive-obsolete",
     defaults: ["art-run-test-defaults"],
diff --git a/test/941-recursive-obsolete-jit/Android.bp b/test/941-recursive-obsolete-jit/Android.bp
index f30ecc7..df6be48 100644
--- a/test/941-recursive-obsolete-jit/Android.bp
+++ b/test/941-recursive-obsolete-jit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `941-recursive-obsolete-jit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-941-recursive-obsolete-jit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/942-private-recursive/Android.bp b/test/942-private-recursive/Android.bp
index bc95f52..a83b776 100644
--- a/test/942-private-recursive/Android.bp
+++ b/test/942-private-recursive/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `942-private-recursive`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-942-private-recursive",
     defaults: ["art-run-test-defaults"],
diff --git a/test/943-private-recursive-jit/Android.bp b/test/943-private-recursive-jit/Android.bp
index 0c297c1..96593f0 100644
--- a/test/943-private-recursive-jit/Android.bp
+++ b/test/943-private-recursive-jit/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `943-private-recursive-jit`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-943-private-recursive-jit",
     defaults: ["art-run-test-defaults"],
diff --git a/test/944-transform-classloaders/Android.bp b/test/944-transform-classloaders/Android.bp
index aefd8c4..d988484 100644
--- a/test/944-transform-classloaders/Android.bp
+++ b/test/944-transform-classloaders/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `944-transform-classloaders`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-944-transform-classloaders",
     defaults: ["art-run-test-defaults"],
diff --git a/test/945-obsolete-native/Android.bp b/test/945-obsolete-native/Android.bp
index de4b531..6014da6 100644
--- a/test/945-obsolete-native/Android.bp
+++ b/test/945-obsolete-native/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `945-obsolete-native`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-945-obsolete-native",
     defaults: ["art-run-test-defaults"],
diff --git a/test/946-obsolete-throw/Android.bp b/test/946-obsolete-throw/Android.bp
index 98b7906..aedab56 100644
--- a/test/946-obsolete-throw/Android.bp
+++ b/test/946-obsolete-throw/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `946-obsolete-throw`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-946-obsolete-throw",
     defaults: ["art-run-test-defaults"],
diff --git a/test/947-reflect-method/Android.bp b/test/947-reflect-method/Android.bp
index 154b000..74abcc0 100644
--- a/test/947-reflect-method/Android.bp
+++ b/test/947-reflect-method/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `947-reflect-method`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-947-reflect-method",
     defaults: ["art-run-test-defaults"],
diff --git a/test/949-in-memory-transform/Android.bp b/test/949-in-memory-transform/Android.bp
index d4392c5..ed569e6 100644
--- a/test/949-in-memory-transform/Android.bp
+++ b/test/949-in-memory-transform/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `949-in-memory-transform`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-949-in-memory-transform",
     defaults: ["art-run-test-defaults"],
diff --git a/test/950-redefine-intrinsic/Android.bp b/test/950-redefine-intrinsic/Android.bp
index 70b9be4..2dd669e 100644
--- a/test/950-redefine-intrinsic/Android.bp
+++ b/test/950-redefine-intrinsic/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `950-redefine-intrinsic`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-950-redefine-intrinsic",
     defaults: ["art-run-test-defaults"],
diff --git a/test/951-threaded-obsolete/Android.bp b/test/951-threaded-obsolete/Android.bp
index fbc0934..0870ee2 100644
--- a/test/951-threaded-obsolete/Android.bp
+++ b/test/951-threaded-obsolete/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `951-threaded-obsolete`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-951-threaded-obsolete",
     defaults: ["art-run-test-defaults"],
diff --git a/test/963-default-range-smali/Android.bp b/test/963-default-range-smali/Android.bp
index 827d158..b4cb157 100644
--- a/test/963-default-range-smali/Android.bp
+++ b/test/963-default-range-smali/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `963-default-range-smali`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-963-default-range-smali",
     defaults: ["art-run-test-defaults"],
diff --git a/test/982-ok-no-retransform/Android.bp b/test/982-ok-no-retransform/Android.bp
index 5b3027ce..842071c 100644
--- a/test/982-ok-no-retransform/Android.bp
+++ b/test/982-ok-no-retransform/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `982-ok-no-retransform`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-982-ok-no-retransform",
     defaults: ["art-run-test-defaults"],
diff --git a/test/983-source-transform-verify/Android.bp b/test/983-source-transform-verify/Android.bp
index 44627b3..0260b91 100644
--- a/test/983-source-transform-verify/Android.bp
+++ b/test/983-source-transform-verify/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `983-source-transform-verify`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-983-source-transform-verify",
     defaults: ["art-run-test-defaults"],
diff --git a/test/984-obsolete-invoke/Android.bp b/test/984-obsolete-invoke/Android.bp
index 422229d..fcc2af1 100644
--- a/test/984-obsolete-invoke/Android.bp
+++ b/test/984-obsolete-invoke/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `984-obsolete-invoke`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-984-obsolete-invoke",
     defaults: ["art-run-test-defaults"],
diff --git a/test/985-re-obsolete/Android.bp b/test/985-re-obsolete/Android.bp
index 8a7f961..90ba51a 100644
--- a/test/985-re-obsolete/Android.bp
+++ b/test/985-re-obsolete/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `985-re-obsolete`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-985-re-obsolete",
     defaults: ["art-run-test-defaults"],
diff --git a/test/986-native-method-bind/Android.bp b/test/986-native-method-bind/Android.bp
index 13f7c95..673d786 100644
--- a/test/986-native-method-bind/Android.bp
+++ b/test/986-native-method-bind/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `986-native-method-bind`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-986-native-method-bind",
     defaults: ["art-run-test-defaults"],
diff --git a/test/987-agent-bind/Android.bp b/test/987-agent-bind/Android.bp
index 64001618..99ed3d8 100644
--- a/test/987-agent-bind/Android.bp
+++ b/test/987-agent-bind/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `987-agent-bind`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-987-agent-bind",
     defaults: ["art-run-test-defaults"],
diff --git a/test/988-method-trace/Android.bp b/test/988-method-trace/Android.bp
index e178721..c5f607d 100644
--- a/test/988-method-trace/Android.bp
+++ b/test/988-method-trace/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `988-method-trace`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-988-method-trace",
     defaults: ["art-run-test-defaults"],
diff --git a/test/989-method-trace-throw/Android.bp b/test/989-method-trace-throw/Android.bp
index 7671cc7..71d14b6 100644
--- a/test/989-method-trace-throw/Android.bp
+++ b/test/989-method-trace-throw/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `989-method-trace-throw`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-989-method-trace-throw",
     defaults: ["art-run-test-defaults"],
diff --git a/test/990-field-trace/Android.bp b/test/990-field-trace/Android.bp
index 150f7bf..30997c1 100644
--- a/test/990-field-trace/Android.bp
+++ b/test/990-field-trace/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `990-field-trace`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-990-field-trace",
     defaults: ["art-run-test-defaults"],
diff --git a/test/991-field-trace-2/Android.bp b/test/991-field-trace-2/Android.bp
index f60723b..956c44d 100644
--- a/test/991-field-trace-2/Android.bp
+++ b/test/991-field-trace-2/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `991-field-trace-2`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-991-field-trace-2",
     defaults: ["art-run-test-defaults"],
diff --git a/test/992-source-data/Android.bp b/test/992-source-data/Android.bp
index 34634d6..e33abfd 100644
--- a/test/992-source-data/Android.bp
+++ b/test/992-source-data/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `992-source-data`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-992-source-data",
     defaults: ["art-run-test-defaults"],
diff --git a/test/993-breakpoints/Android.bp b/test/993-breakpoints/Android.bp
index 1633c96..72ce18f 100644
--- a/test/993-breakpoints/Android.bp
+++ b/test/993-breakpoints/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `993-breakpoints`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-993-breakpoints",
     defaults: ["art-run-test-defaults"],
diff --git a/test/994-breakpoint-line/Android.bp b/test/994-breakpoint-line/Android.bp
index fcc6958..4c0cd20 100644
--- a/test/994-breakpoint-line/Android.bp
+++ b/test/994-breakpoint-line/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `994-breakpoint-line`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-994-breakpoint-line",
     defaults: ["art-run-test-defaults"],
diff --git a/test/995-breakpoints-throw/Android.bp b/test/995-breakpoints-throw/Android.bp
index 150c355..00146b0 100644
--- a/test/995-breakpoints-throw/Android.bp
+++ b/test/995-breakpoints-throw/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `995-breakpoints-throw`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-995-breakpoints-throw",
     defaults: ["art-run-test-defaults"],
diff --git a/test/996-breakpoint-obsolete/Android.bp b/test/996-breakpoint-obsolete/Android.bp
index 4e67672..d1ea56b 100644
--- a/test/996-breakpoint-obsolete/Android.bp
+++ b/test/996-breakpoint-obsolete/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `996-breakpoint-obsolete`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-996-breakpoint-obsolete",
     defaults: ["art-run-test-defaults"],
diff --git a/test/997-single-step/Android.bp b/test/997-single-step/Android.bp
index 6a4e881..45d29ab 100644
--- a/test/997-single-step/Android.bp
+++ b/test/997-single-step/Android.bp
@@ -2,7 +2,6 @@
 
 // Build rules for ART run-test `997-single-step`.
 
-// Test's Dex code.
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -12,6 +11,7 @@
     default_applicable_licenses: ["art_license"],
 }
 
+// Test's Dex code.
 java_test {
     name: "art-run-test-997-single-step",
     defaults: ["art-run-test-defaults"],
diff --git a/test/utils/regen-test-files b/test/utils/regen-test-files
index 1f48aad..fe4534a 100755
--- a/test/utils/regen-test-files
+++ b/test/utils/regen-test-files
@@ -490,7 +490,6 @@
 
       // Build rules for ART run-test `{run_test}`.
 
-      // Test's Dex code.
       package {{
           // See: http://go/android-license-faq
           // A large-scale-change added 'default_applicable_licenses' to import
@@ -500,6 +499,7 @@
           default_applicable_licenses: ["art_license"],
       }}
 
+      // Test's Dex code.
       java_test {{
           name: "{run_test_module_name}",
           defaults: ["art-run-test-defaults"],