Revert "DO NOT MERGE: Drop prebuilt files to android source tree."

Revert submission 25116597-51104031-167a-4004-ba21-b1803829c3d4

Reason for revert: <Broken build>

Reverted changes: /q/submissionid:25116597-51104031-167a-4004-ba21-b1803829c3d4

Change-Id: Ife545e207beb45233ea1796aa3e826def51f5848

24 files changed, 7 insertions, 6 deletions

diff --git a/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
index becffcef..9c60efcd 100644
--- a/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_host-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1008009"
+    build_id: "T1007601"
     target: "train_build"
     source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.art/host-exports/art-module-host-exports-current.zip"
   }
diff --git a/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb b/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
index cdc9d54d..bd77bf49 100644
--- a/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
+++ b/.prebuilt_info/prebuilt_info_current_test-exports_current_zip.asciipb
@@ -1,6 +1,6 @@
 drops {
   android_build_drop {
-    build_id: "T1008009"
+    build_id: "T1007601"
     target: "train_build"
     source_file: "mainline-sdks/for-UpsideDownCake-build/current/com.google.android.art/test-exports/art-module-test-exports-current.zip"
   }
diff --git a/current/host-exports/java/android/okhttp-norepackage.jar b/current/host-exports/java/android/okhttp-norepackage.jar
index e69de29b..e33f635b 100644
--- a/current/host-exports/java/android/okhttp-norepackage.jar
+++ b/current/host-exports/java/android/okhttp-norepackage.jar
diff --git a/current/host-exports/java/linux_glibc/okhttp-norepackage.jar b/current/host-exports/java/linux_glibc/okhttp-norepackage.jar
index e69de29b..e33f635b 100644
--- a/current/host-exports/java/linux_glibc/okhttp-norepackage.jar
+++ b/current/host-exports/java/linux_glibc/okhttp-norepackage.jar
diff --git a/current/host-exports/snapshot-creation-build-number.txt b/current/host-exports/snapshot-creation-build-number.txt
index c053c2dd..d33d0a05 100644
--- a/current/host-exports/snapshot-creation-build-number.txt
+++ b/current/host-exports/snapshot-creation-build-number.txt
@@ -1,2 +1 @@
-10774978
-
+10572802
\ No newline at end of file
diff --git a/current/host-exports/x86_64/bin/dex2oat64 b/current/host-exports/x86_64/bin/dex2oat64
index e69de29b..3778b6b3 100755
--- a/current/host-exports/x86_64/bin/dex2oat64
+++ b/current/host-exports/x86_64/bin/dex2oat64
diff --git a/current/host-exports/x86_64/bin/dex2oatd64 b/current/host-exports/x86_64/bin/dex2oatd64
index e69de29b..6c46b826 100755
--- a/current/host-exports/x86_64/bin/dex2oatd64
+++ b/current/host-exports/x86_64/bin/dex2oatd64
diff --git a/current/host-exports/x86_64/bin/dexdump b/current/host-exports/x86_64/bin/dexdump
index e69de29b..0d7528a2 100755
--- a/current/host-exports/x86_64/bin/dexdump
+++ b/current/host-exports/x86_64/bin/dexdump
diff --git a/current/host-exports/x86_64/bin/hiddenapi b/current/host-exports/x86_64/bin/hiddenapi
index e69de29b..66b01b8a 100755
--- a/current/host-exports/x86_64/bin/hiddenapi
+++ b/current/host-exports/x86_64/bin/hiddenapi
diff --git a/current/host-exports/x86_64/bin/oatdump b/current/host-exports/x86_64/bin/oatdump
index e69de29b..188d0211 100755
--- a/current/host-exports/x86_64/bin/oatdump
+++ b/current/host-exports/x86_64/bin/oatdump
diff --git a/current/host-exports/x86_64/bin/profman b/current/host-exports/x86_64/bin/profman
index e69de29b..04023fca 100755
--- a/current/host-exports/x86_64/bin/profman
+++ b/current/host-exports/x86_64/bin/profman
diff --git a/current/host-exports/x86_64/bin/veridex b/current/host-exports/x86_64/bin/veridex
index e69de29b..82b709b1 100755
--- a/current/host-exports/x86_64/bin/veridex
+++ b/current/host-exports/x86_64/bin/veridex
diff --git a/current/test-exports/Android.bp b/current/test-exports/Android.bp
index 1d083d06..aa990b72 100644
--- a/current/test-exports/Android.bp
+++ b/current/test-exports/Android.bp
@@ -39,6 +39,7 @@ java_import {
     },
     visibility: [
         "//art/build/sdk",
+        "//cts/tests/core/runner-axt",
         "//cts/tests/tests/util",
         "//external/conscrypt",
         "//external/conscrypt/apex/tests",
@@ -47,6 +48,7 @@ java_import {
         "//frameworks/base/wifi/tests",
         "//libcore",
         "//libcore/luni/src/test/java9compatibility",
+        "//libcore/ojluni/src/test",
         "//packages/modules/Wifi/framework/tests",
         "//prebuilts:__subpackages__",
     ],
@@ -322,6 +324,7 @@ java_test_import {
         "//art/build/sdk",
         "//cts/tests/libcore/luni",
         "//external/apache-harmony",
+        "//libcore",
         "//prebuilts:__subpackages__",
     ],
     apex_available: ["//apex_available:platform"],
diff --git a/current/test-exports/arm64/lib/libjavacoretests.so b/current/test-exports/arm64/lib/libjavacoretests.so
index e69de29b..e38d6798 100755
--- a/current/test-exports/arm64/lib/libjavacoretests.so
+++ b/current/test-exports/arm64/lib/libjavacoretests.so
diff --git a/current/test-exports/java/core-compat-test-rules.jar b/current/test-exports/java/core-compat-test-rules.jar
index e69de29b..100cb254 100644
--- a/current/test-exports/java/core-compat-test-rules.jar
+++ b/current/test-exports/java/core-compat-test-rules.jar
diff --git a/current/test-exports/java/core-libart-for-host.jar b/current/test-exports/java/core-libart-for-host.jar
index e69de29b..a43e54f3 100644
--- a/current/test-exports/java/core-libart-for-host.jar
+++ b/current/test-exports/java/core-libart-for-host.jar
diff --git a/current/test-exports/java/core-test-rules.jar b/current/test-exports/java/core-test-rules.jar
index e69de29b..6055b5d7 100644
--- a/current/test-exports/java/core-test-rules.jar
+++ b/current/test-exports/java/core-test-rules.jar
diff --git a/current/test-exports/java/core-tests.jar b/current/test-exports/java/core-tests.jar
index e69de29b..cf29970e 100644
--- a/current/test-exports/java/core-tests.jar
+++ b/current/test-exports/java/core-tests.jar
diff --git a/current/test-exports/java/libcore-crypto-tests.jar b/current/test-exports/java/libcore-crypto-tests.jar
index e69de29b..7b26f3ed 100644
--- a/current/test-exports/java/libcore-crypto-tests.jar
+++ b/current/test-exports/java/libcore-crypto-tests.jar
diff --git a/current/test-exports/java/libcore-expectations-knownfailures-jar.jar b/current/test-exports/java/libcore-expectations-knownfailures-jar.jar
index e69de29b..f2691756 100644
--- a/current/test-exports/java/libcore-expectations-knownfailures-jar.jar
+++ b/current/test-exports/java/libcore-expectations-knownfailures-jar.jar
diff --git a/current/test-exports/java/okhttp-nojarjar.jar b/current/test-exports/java/okhttp-nojarjar.jar
index e69de29b..734a25e2 100644
--- a/current/test-exports/java/okhttp-nojarjar.jar
+++ b/current/test-exports/java/okhttp-nojarjar.jar
diff --git a/current/test-exports/snapshot-creation-build-number.txt b/current/test-exports/snapshot-creation-build-number.txt
index c053c2dd..d33d0a05 100644
--- a/current/test-exports/snapshot-creation-build-number.txt
+++ b/current/test-exports/snapshot-creation-build-number.txt
@@ -1,2 +1 @@
-10774978
-
+10572802
\ No newline at end of file
diff --git a/current/test-exports/x86/lib/libjavacoretests.so b/current/test-exports/x86/lib/libjavacoretests.so
index e69de29b..0a0e42ae 100755
--- a/current/test-exports/x86/lib/libjavacoretests.so
+++ b/current/test-exports/x86/lib/libjavacoretests.so
diff --git a/current/test-exports/x86_64/lib/libjavacoretests.so b/current/test-exports/x86_64/lib/libjavacoretests.so
index e69de29b..90ae90c6 100755
--- a/current/test-exports/x86_64/lib/libjavacoretests.so
+++ b/current/test-exports/x86_64/lib/libjavacoretests.so