Snap for 8426163 from 5057c04a275d9e90788115accf291b9afa588570 to mainline-tzdata2-releaseandroid-mainline-12.0.0_r112aml_tz2_305400500aml_tz2_305400300aml_tz2_305400100aml_tz2_304500300aml_tz2_303900110aml_tz2_303900102aml_tz2_303800002aml_tz2_303800001aml_tz2_303200001android12-mainline-tzdata2-releaseaml_tz2_305400100

Change-Id: I17081cb17cb4838db74e864d2ea9afa1c906f7ee

21 files changed, 17 insertions, 973 deletions

diff --git a/Android.bp b/Android.bp
index cc4b402b..28403b35 100644
--- a/Android.bp
+++ b/Android.bp
@@ -16,136 +16,3 @@ package {
     default_visibility: ["//packages/modules/common:__subpackages__"],
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
-
-soong_config_bool_variable {
-    name: "module_build_from_source",
-}
-
-soong_config_module_type {
-    name: "module_apex_set",
-    module_type: "apex_set",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: [
-        "prefer",
-    ],
-}
-
-soong_config_module_type {
-    name: "module_android_app_import",
-    module_type: "android_app_import",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: [
-        "prefer",
-    ],
-}
-
-soong_config_module_type {
-    name: "module_android_app_set",
-    module_type: "android_app_set",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: [
-        "prefer",
-    ],
-}
-
-soong_config_module_type {
-    name: "module_prebuilt_bootclasspath_fragment",
-    module_type: "prebuilt_bootclasspath_fragment",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: [
-        "prefer",
-    ],
-}
-
-soong_config_module_type {
-    name: "module_java_import",
-    module_type: "java_import",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: [
-        "prefer",
-    ],
-}
-soong_config_module_type {
-    name: "module_java_sdk_library_import",
-    module_type: "java_sdk_library_import",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: [
-        "prefer",
-    ],
-}
-
-soong_config_module_type {
-    name: "module_cc_prebuilt_binary",
-    module_type: "cc_prebuilt_binary",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: [
-        "prefer",
-    ],
-}
-
-soong_config_module_type {
-    name: "module_cc_prebuilt_library_shared",
-    module_type: "cc_prebuilt_library_shared",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: [
-        "prefer",
-    ],
-}
-
-soong_config_module_type {
-    name: "module_cc_prebuilt_library_headers",
-    module_type: "cc_prebuilt_library_headers",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: [
-        "prefer",
-    ],
-}
-
-soong_config_module_type {
-    name: "module_java_library",
-    module_type: "java_library",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: [
-        "enabled",
-    ],
-}
-
-soong_config_module_type {
-    name: "module_apex",
-    module_type: "apex",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: [
-        "enabled",
-    ],
-}
-
-soong_config_module_type {
-    name: "module_apex_test",
-    module_type: "apex_test",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: [
-        "enabled",
-    ],
-}
-
-soong_config_module_type {
-    name: "module_override_apex",
-    module_type: "override_apex",
-    config_namespace: "ANDROID",
-    bool_variables: ["module_build_from_source"],
-    properties: [
-        "enabled",
-    ],
-}
diff --git a/MODULES_OWNERS b/MODULES_OWNERS
index 1db0ed04..95e3fc8a 100644
--- a/MODULES_OWNERS
+++ b/MODULES_OWNERS
@@ -3,9 +3,7 @@
 # classes of change within mainline modules and their build rules.
 #
 # It should be included in a module OWNERS file via:
-# include platform/packages/modules/common:/MODULES_OWNERS
-#
-# See go/mainline-owners-policy for more details.
+# include packages/modules/common:/MODULES_OWNERS
 
-mathewi@google.com #{LAST_RESORT_SUGGESTION}
-hansson@google.com #{LAST_RESORT_SUGGESTION}
+mathewi@google.com
+hansson@google.com
diff --git a/OWNERS b/OWNERS
index ec712746..63e7cdf1 100644
--- a/OWNERS
+++ b/OWNERS
@@ -8,4 +8,4 @@ pedroql@google.com
 satayev@google.com
 
 # Escalations
-jham@google.com
\ No newline at end of file
+jham@google.com
diff --git a/PREBUILTS_MODULE_OWNERS b/PREBUILTS_MODULE_OWNERS
deleted file mode 100644
index 5a2efe33..00000000
--- a/PREBUILTS_MODULE_OWNERS
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is intended to be included in the OWNERS file for mainline modules
-# prebuilts.  The goal is to allow the mainline modularization and release team
-# to update the prebuilts in bulk and on a regular basis without being blocked
-# on approvals.  classes of change within mainline modules and their build
-# rules.
-#
-# It should be included in a prebuilt module OWNERS file via:
-# include platform/packages/modules/common:/PREBUILTS_MODULES_OWNERS
-#
-# See go/mainline-owners-policy for more details.
-
-include platform/packages/modules/common:/MODULES_OWNERS
-aseaton@google.com #{LAST_RESORT_SUGGESTION}
-dariofreni@google.com #{LAST_RESORT_SUGGESTION}
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index ec002459..ce751504 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -1,3 +1,2 @@
 [Hook Scripts]
 do_not_use_DO_NOT_MERGE = ${REPO_ROOT}/build/soong/scripts/check_do_not_merge.sh ${PREUPLOAD_COMMIT}
-check_allowed_deps_commit = ${REPO_ROOT}/packages/modules/common/tools/check_allowed_deps.py ${PREUPLOAD_COMMIT}
\ No newline at end of file
diff --git a/build/OWNERS b/build/OWNERS
deleted file mode 100644
index 9e766544..00000000
--- a/build/OWNERS
+++ /dev/null
@@ -1 +0,0 @@
-per-file allowed_deps.txt = *
\ No newline at end of file
diff --git a/build/allowed_deps.txt b/build/allowed_deps.txt
index 48190aab..3d8474c4 100644
--- a/build/allowed_deps.txt
+++ b/build/allowed_deps.txt
@@ -16,7 +16,6 @@
 android.hardware.cas.native@1.0(minSdkVersion:29)
 android.hardware.cas@1.0(minSdkVersion:29)
 android.hardware.common-ndk_platform(minSdkVersion:29)
-android.hardware.common-V2-ndk(minSdkVersion:29)
 android.hardware.common-V2-ndk_platform(minSdkVersion:29)
 android.hardware.graphics.allocator@2.0(minSdkVersion:29)
 android.hardware.graphics.allocator@3.0(minSdkVersion:29)
@@ -24,7 +23,6 @@ android.hardware.graphics.allocator@4.0(minSdkVersion:29)
 android.hardware.graphics.bufferqueue@1.0(minSdkVersion:29)
 android.hardware.graphics.bufferqueue@2.0(minSdkVersion:29)
 android.hardware.graphics.common-ndk_platform(minSdkVersion:29)
-android.hardware.graphics.common-V2-ndk(minSdkVersion:29)
 android.hardware.graphics.common-V2-ndk_platform(minSdkVersion:29)
 android.hardware.graphics.common@1.0(minSdkVersion:29)
 android.hardware.graphics.common@1.1(minSdkVersion:29)
@@ -39,7 +37,6 @@ android.hardware.media.c2@1.1(minSdkVersion:29)
 android.hardware.media.c2@1.2(minSdkVersion:29)
 android.hardware.media.omx@1.0(minSdkVersion:29)
 android.hardware.media@1.0(minSdkVersion:29)
-android.hardware.neuralnetworks-V1-ndk(minSdkVersion:30)
 android.hardware.neuralnetworks-V1-ndk_platform(minSdkVersion:30)
 android.hardware.neuralnetworks@1.0(minSdkVersion:30)
 android.hardware.neuralnetworks@1.1(minSdkVersion:30)
@@ -55,7 +52,6 @@ android.hardware.wifi-V1.2-java(minSdkVersion:30)
 android.hardware.wifi-V1.3-java(minSdkVersion:30)
 android.hardware.wifi-V1.4-java(minSdkVersion:30)
 android.hardware.wifi-V1.5-java(minSdkVersion:30)
-android.hardware.wifi.hostapd-V1-java(minSdkVersion:30)
 android.hardware.wifi.hostapd-V1.0-java(minSdkVersion:30)
 android.hardware.wifi.hostapd-V1.1-java(minSdkVersion:30)
 android.hardware.wifi.hostapd-V1.2-java(minSdkVersion:30)
@@ -75,9 +71,7 @@ android.hidl.memory@1.0(minSdkVersion:29)
 android.hidl.safe_union@1.0(minSdkVersion:29)
 android.hidl.token@1.0(minSdkVersion:29)
 android.hidl.token@1.0-utils(minSdkVersion:29)
-android.media.audio.common.types-V1-cpp(minSdkVersion:29)
 android.net.ipsec.ike.xml(minSdkVersion:(no version))
-android_downloader_lib(minSdkVersion:30)
 androidx-constraintlayout_constraintlayout(minSdkVersion:14)
 androidx-constraintlayout_constraintlayout-solver(minSdkVersion:24)
 androidx.activity_activity(minSdkVersion:14)
@@ -93,7 +87,6 @@ androidx.autofill_autofill(minSdkVersion:14)
 androidx.cardview_cardview(minSdkVersion:14)
 androidx.collection_collection(minSdkVersion:24)
 androidx.collection_collection-ktx(minSdkVersion:24)
-androidx.concurrent_concurrent-futures(minSdkVersion:24)
 androidx.coordinatorlayout_coordinatorlayout(minSdkVersion:14)
 androidx.core_core(minSdkVersion:14)
 androidx.core_core-ktx(minSdkVersion:14)
@@ -102,8 +95,6 @@ androidx.customview_customview(minSdkVersion:14)
 androidx.documentfile_documentfile(minSdkVersion:14)
 androidx.drawerlayout_drawerlayout(minSdkVersion:14)
 androidx.dynamicanimation_dynamicanimation(minSdkVersion:14)
-androidx.emoji2_emoji(minSdkVersion:14)
-androidx.emoji2_emoji2-views-helpe(minSdkVersion:14)
 androidx.fragment_fragment(minSdkVersion:14)
 androidx.fragment_fragment-ktx(minSdkVersion:14)
 androidx.interpolator_interpolator(minSdkVersion:14)
@@ -142,15 +133,9 @@ androidx.preference_preference(minSdkVersion:14)
 androidx.print_print(minSdkVersion:14)
 androidx.recyclerview_recyclerview(minSdkVersion:14)
 androidx.recyclerview_recyclerview-selection(minSdkVersion:14)
-androidx.resourceinspection_resourceinspection-annotation(minSdkVersion:24)
-androidx.room_room-common(minSdkVersion:24)
-androidx.room_room-runtime(minSdkVersion:14)
 androidx.savedstate_savedstate(minSdkVersion:14)
 androidx.savedstate_savedstate-ktx(minSdkVersion:14)
 androidx.slidingpanelayout_slidingpanelayout(minSdkVersion:14)
-androidx.sqlite_sqlite(minSdkVersion:14)
-androidx.sqlite_sqlite-framework(minSdkVersion:14)
-androidx.startup_startup-runtime(minSdkVersion:14)
 androidx.swiperefreshlayout_swiperefreshlayout(minSdkVersion:14)
 androidx.tracing_tracing(minSdkVersion:14)
 androidx.transition_transition(minSdkVersion:14)
@@ -159,14 +144,11 @@ androidx.vectordrawable_vectordrawable-animated(minSdkVersion:14)
 androidx.versionedparcelable_versionedparcelable(minSdkVersion:14)
 androidx.viewpager2_viewpager2(minSdkVersion:14)
 androidx.viewpager_viewpager(minSdkVersion:14)
-androidx.window_window(minSdkVersion:14)
-androidx.work_work-runtime(minSdkVersion:14)
 apache-commons-compress(minSdkVersion:current)
 apache-xml(minSdkVersion:31)
 audioclient-types-aidl-cpp(minSdkVersion:29)
 audioflinger-aidl-cpp(minSdkVersion:29)
 audiopolicy-aidl-cpp(minSdkVersion:29)
-auto_value_annotations(minSdkVersion:19)
 av-headers(minSdkVersion:29)
 av-types-aidl-cpp(minSdkVersion:29)
 bcm_object(minSdkVersion:29)
@@ -177,7 +159,6 @@ bouncycastle-unbundled(minSdkVersion:30)
 bpf_syscall_wrappers(minSdkVersion:30)
 brotli-java(minSdkVersion:current)
 captiveportal-lib(minSdkVersion:29)
-car-rotary-lib(minSdkVersion:28)
 car-ui-lib(minSdkVersion:28)
 codecs_g711dec(minSdkVersion:29)
 com.google.android.material_material(minSdkVersion:14)
@@ -212,50 +193,38 @@ ExtServices-core(minSdkVersion:current)
 flatbuffer_headers(minSdkVersion:(no version))
 fmtlib(minSdkVersion:29)
 fmtlib_ndk(minSdkVersion:29)
-fp16_headers(minSdkVersion:30)
 framework-mediaprovider(minSdkVersion:30)
 framework-permission(minSdkVersion:30)
 framework-permission(minSdkVersion:current)
 framework-statsd(minSdkVersion:30)
 framework-statsd(minSdkVersion:current)
 framework-tethering(minSdkVersion:30)
-framework-uwb(minSdkVersion:current)
 framework-wifi(minSdkVersion:30)
 framework-wifi-util-lib(minSdkVersion:30)
 gemmlowp_headers(minSdkVersion:(no version))
 GoogleCellBroadcastApp(minSdkVersion:29)
 GoogleCellBroadcastServiceModule(minSdkVersion:29)
 GoogleExtServices(minSdkVersion:30)
-GoogleExtServices(minSdkVersion:current)
 GooglePermissionController(minSdkVersion:28)
 GooglePermissionController(minSdkVersion:30)
 guava(minSdkVersion:current)
 gwp_asan_headers(minSdkVersion:S)
 iconloader(minSdkVersion:21)
-iconloader(minSdkVersion:26)
 ipmemorystore-aidl-interfaces-java(minSdkVersion:29)
 ipmemorystore-aidl-interfaces-V10-java(minSdkVersion:29)
 jacocoagent(minSdkVersion:9)
 jni_headers(minSdkVersion:29)
 jni_platform_headers(minSdkVersion:S)
 jsr305(minSdkVersion:14)
-kotlinx-coroutines-android(minSdkVersion:28)
 kotlinx-coroutines-android(minSdkVersion:current)
 kotlinx-coroutines-core(minSdkVersion:current)
-kotlinx_atomicfu(minSdkVersion:current)
-kotlinx_coroutines(minSdkVersion:28)
-kotlinx_coroutines_android(minSdkVersion:28)
 ksoap2(minSdkVersion:30)
 libaacextractor(minSdkVersion:29)
 libadbconnection_server(minSdkVersion:(no version))
 libadbd_core(minSdkVersion:(no version))
 libadbd_services(minSdkVersion:(no version))
 libaidlcommonsupport(minSdkVersion:29)
-liballoc.rust_sysroot(minSdkVersion:(no version))
 libamrextractor(minSdkVersion:29)
-libandroid_log_sys(minSdkVersion:(no version))
-libandroid_logger(minSdkVersion:(no version))
-libanyhow(minSdkVersion:(no version))
 libapp_processes_protos_lite(minSdkVersion:(no version))
 libarect(minSdkVersion:29)
 libasync_safe(minSdkVersion:apex_inherit)
@@ -272,10 +241,7 @@ libavcenc(minSdkVersion:29)
 libavservices_minijail(minSdkVersion:29)
 libbacktrace(minSdkVersion:apex_inherit)
 libbacktrace_headers(minSdkVersion:apex_inherit)
-libbacktrace_rs.rust_sysroot(minSdkVersion:(no version))
-libbacktrace_sys.rust_sysroot(minSdkVersion:(no version))
 libbase(minSdkVersion:29)
-libbase64_rust(minSdkVersion:(no version))
 libbase_headers(minSdkVersion:29)
 libbase_ndk(minSdkVersion:29)
 libbinder_headers(minSdkVersion:29)
@@ -284,7 +250,6 @@ libbinderthreadstateutils(minSdkVersion:29)
 libbluetooth-types-header(minSdkVersion:29)
 libbrotli(minSdkVersion:(no version))
 libbuildversion(minSdkVersion:(no version))
-libbytes(minSdkVersion:(no version))
 libc++(minSdkVersion:apex_inherit)
 libc++_static(minSdkVersion:apex_inherit)
 libc++abi(minSdkVersion:apex_inherit)
@@ -294,8 +259,6 @@ libc_headers_arch(minSdkVersion:apex_inherit)
 libc_llndk_headers(minSdkVersion:apex_inherit)
 libc_scudo(minSdkVersion:apex_inherit)
 libcap(minSdkVersion:29)
-libcfg_if(minSdkVersion:(no version))
-libcfg_if.rust_sysroot(minSdkVersion:(no version))
 libcodec2(minSdkVersion:29)
 libcodec2_headers(minSdkVersion:29)
 libcodec2_hidl@1.0(minSdkVersion:29)
@@ -334,8 +297,6 @@ libcodec2_soft_vp8enc(minSdkVersion:29)
 libcodec2_soft_vp9dec(minSdkVersion:29)
 libcodec2_soft_vp9enc(minSdkVersion:29)
 libcodec2_vndk(minSdkVersion:29)
-libcompiler_builtins.rust_sysroot(minSdkVersion:(no version))
-libcore.rust_sysroot(minSdkVersion:(no version))
 libcrypto(minSdkVersion:29)
 libcrypto_static(minSdkVersion:(no version))
 libcrypto_utils(minSdkVersion:(no version))
@@ -347,9 +308,7 @@ libdexfile_support(minSdkVersion:S)
 libdiagnose_usb(minSdkVersion:(no version))
 libdmabufheap(minSdkVersion:29)
 libdmabufinfo(minSdkVersion:S)
-libdoh_ffi(minSdkVersion:(no version))
 libeigen(minSdkVersion:(no version))
-libenv_logger(minSdkVersion:(no version))
 libexpat(minSdkVersion:apex_inherit)
 libextservices(minSdkVersion:30)
 libextservices_jni(minSdkVersion:30)
@@ -361,21 +320,11 @@ libFLAC-headers(minSdkVersion:29)
 libflacextractor(minSdkVersion:29)
 libfmq(minSdkVersion:29)
 libfmq-base(minSdkVersion:29)
-libform_urlencoded(minSdkVersion:(no version))
 libFraunhoferAAC(minSdkVersion:29)
 libfuse(minSdkVersion:30)
 libfuse_jni(minSdkVersion:30)
-libfutures(minSdkVersion:(no version))
-libfutures_channel(minSdkVersion:(no version))
-libfutures_core(minSdkVersion:(no version))
-libfutures_executor(minSdkVersion:(no version))
-libfutures_io(minSdkVersion:(no version))
-libfutures_sink(minSdkVersion:(no version))
-libfutures_task(minSdkVersion:(no version))
-libfutures_util(minSdkVersion:(no version))
 libgav1(minSdkVersion:29)
 libgcc_stripped(minSdkVersion:(no version))
-libgetopts(minSdkVersion:(no version))
 libgralloctypes(minSdkVersion:29)
 libgrallocusage(minSdkVersion:29)
 libgsm(minSdkVersion:apex_inherit)
@@ -385,31 +334,20 @@ libgui_bufferqueue_static(minSdkVersion:29)
 libgui_headers(minSdkVersion:29)
 libhardware(minSdkVersion:29)
 libhardware_headers(minSdkVersion:29)
-libhashbrown.rust_sysroot(minSdkVersion:(no version))
 libhevcdec(minSdkVersion:29)
 libhevcenc(minSdkVersion:29)
 libhidlbase(minSdkVersion:29)
 libhidlmemory(minSdkVersion:29)
 libhwbinder-impl-internal(minSdkVersion:29)
 libhwbinder_headers(minSdkVersion:29)
-libidna(minSdkVersion:(no version))
 libion(minSdkVersion:29)
 libjsoncpp(minSdkVersion:29)
-libkll(minSdkVersion:30)
-libkll-encoder(minSdkVersion:30)
-libkll-protos(minSdkVersion:30)
-liblazy_static(minSdkVersion:(no version))
-liblibc(minSdkVersion:(no version))
-liblibc.rust_sysroot(minSdkVersion:(no version))
 libLibGuiProperties(minSdkVersion:29)
-liblibm(minSdkVersion:(no version))
 liblog_headers(minSdkVersion:29)
-liblog_rust(minSdkVersion:(no version))
 liblua(minSdkVersion:(no version))
 liblua(minSdkVersion:30)
 liblz4(minSdkVersion:(no version))
 liblzma(minSdkVersion:apex_inherit)
-libmatches(minSdkVersion:(no version))
 libmath(minSdkVersion:29)
 libmath_headers(minSdkVersion:apex_inherit)
 libmdnssd(minSdkVersion:(no version))
@@ -419,7 +357,6 @@ libmedia_headers(minSdkVersion:29)
 libmedia_helper_headers(minSdkVersion:29)
 libmedia_midiiowrapper(minSdkVersion:29)
 libmediaformatshaper(minSdkVersion:29)
-libmemchr(minSdkVersion:(no version))
 libmeminfo(minSdkVersion:S)
 libminijail(minSdkVersion:29)
 libminijail_gen_constants(minSdkVersion:(no version))
@@ -427,7 +364,6 @@ libminijail_gen_constants_obj(minSdkVersion:29)
 libminijail_gen_syscall(minSdkVersion:(no version))
 libminijail_gen_syscall_obj(minSdkVersion:29)
 libminijail_generated(minSdkVersion:29)
-libmio(minSdkVersion:(no version))
 libmkvextractor(minSdkVersion:29)
 libmp3extractor(minSdkVersion:29)
 libmp4extractor(minSdkVersion:29)
@@ -436,7 +372,6 @@ libnanohttpd(minSdkVersion:30)
 libnativebase_headers(minSdkVersion:29)
 libnativebridge-headers(minSdkVersion:S)
 libnativehelper_compat_libc++(minSdkVersion:(no version))
-libnativehelper_compat_libc++(minSdkVersion:29)
 libnativehelper_header_only(minSdkVersion:29)
 libnativeloader-headers(minSdkVersion:S)
 libnativewindow_headers(minSdkVersion:29)
@@ -447,18 +382,11 @@ libnetworkstackutilsjni(minSdkVersion:29)
 libneuralnetworks_common(minSdkVersion:(no version))
 libneuralnetworks_headers(minSdkVersion:(no version))
 libneuralnetworks_shim_static(minSdkVersion:30)
-libnum_cpus(minSdkVersion:(no version))
 liboggextractor(minSdkVersion:29)
-libonce_cell(minSdkVersion:(no version))
 libopenjdkjvmti_headers(minSdkVersion:S)
 libopus(minSdkVersion:29)
-libpanic_abort.rust_sysroot(minSdkVersion:(no version))
-libpercent_encoding(minSdkVersion:(no version))
 libperfetto_client_experimental(minSdkVersion:S)
-libpin_project_lite(minSdkVersion:(no version))
-libpin_utils(minSdkVersion:(no version))
 libPlatformProperties(minSdkVersion:S)
-libproc_macro_nested(minSdkVersion:(no version))
 libprocessgroup(minSdkVersion:29)
 libprocessgroup_headers(minSdkVersion:29)
 libprocinfo(minSdkVersion:apex_inherit)
@@ -468,25 +396,15 @@ libprofile-clang-extras_cfi_support(minSdkVersion:(no version))
 libprofile-clang-extras_ndk(minSdkVersion:(no version))
 libprofile-extras(minSdkVersion:(no version))
 libprofile-extras_ndk(minSdkVersion:(no version))
-libprofiler_builtins.rust_sysroot(minSdkVersion:(no version))
 libprotobuf-cpp-lite(minSdkVersion:29)
 libprotobuf-java-lite(minSdkVersion:current)
 libprotobuf-java-nano(minSdkVersion:9)
 libprotoutil(minSdkVersion:(no version))
 libqemu_pipe(minSdkVersion:(no version))
-libquiche(minSdkVersion:(no version))
-libring(minSdkVersion:(no version))
-libring-core(minSdkVersion:29)
-libring-test(minSdkVersion:29)
-librustc_demangle(minSdkVersion:(no version))
-librustc_demangle.rust_sysroot(minSdkVersion:(no version))
-librustc_demangle_static(minSdkVersion:(no version))
 libruy_static(minSdkVersion:30)
 libsfplugin_ccodec_utils(minSdkVersion:29)
-libslab(minSdkVersion:(no version))
 libsonivoxwithoutjet(minSdkVersion:29)
 libspeexresampler(minSdkVersion:29)
-libspin(minSdkVersion:(no version))
 libssl(minSdkVersion:29)
 libstagefright_amrnb_common(minSdkVersion:29)
 libstagefright_amrnbdec(minSdkVersion:29)
@@ -500,7 +418,6 @@ libstagefright_enc_common(minSdkVersion:29)
 libstagefright_esds(minSdkVersion:29)
 libstagefright_flacdec(minSdkVersion:29)
 libstagefright_foundation(minSdkVersion:29)
-libstagefright_foundation_colorutils_ndk(minSdkVersion:29)
 libstagefright_foundation_headers(minSdkVersion:29)
 libstagefright_foundation_without_imemory(minSdkVersion:29)
 libstagefright_headers(minSdkVersion:29)
@@ -513,13 +430,9 @@ libstagefright_mp3dec_headers(minSdkVersion:29)
 libstagefright_mpeg2extractor(minSdkVersion:29)
 libstagefright_mpeg2support(minSdkVersion:29)
 libstatssocket_headers(minSdkVersion:29)
-libstd(minSdkVersion:(no version))
-libstd_detect.rust_sysroot(minSdkVersion:(no version))
 libsync(minSdkVersion:(no version))
 libsystem_headers(minSdkVersion:apex_inherit)
 libsysutils(minSdkVersion:apex_inherit)
-libterm(minSdkVersion:(no version))
-libtest(minSdkVersion:(no version))
 libtextclassifier(minSdkVersion:(no version))
 libtextclassifier(minSdkVersion:30)
 libtextclassifier-java(minSdkVersion:28)
@@ -531,21 +444,11 @@ libtextclassifier_hash_static(minSdkVersion:(no version))
 libtflite_kernel_utils(minSdkVersion:(no version))
 libtflite_static(minSdkVersion:(no version))
 libtflite_static(minSdkVersion:30)
-libtinyvec(minSdkVersion:(no version))
-libtinyvec_macros(minSdkVersion:(no version))
-libtinyxml2(minSdkVersion:S)
-libtokio(minSdkVersion:(no version))
 libui(minSdkVersion:29)
 libui-types(minSdkVersion:apex_inherit)
 libui_headers(minSdkVersion:29)
-libunicode_bidi(minSdkVersion:(no version))
-libunicode_normalization(minSdkVersion:(no version))
-libunicode_width.rust_sysroot(minSdkVersion:(no version))
-libuntrusted(minSdkVersion:(no version))
-libunwind.rust_sysroot(minSdkVersion:(no version))
 libunwind_llvm(minSdkVersion:apex_inherit)
 libunwindstack(minSdkVersion:29)
-liburl(minSdkVersion:(no version))
 libutf(minSdkVersion:(no version))
 libutils(minSdkVersion:apex_inherit)
 libutils_headers(minSdkVersion:apex_inherit)
@@ -566,15 +469,9 @@ MediaProviderGoogle(minSdkVersion:30)
 mediaswcodec(minSdkVersion:29)
 metrics-constants-protos(minSdkVersion:29)
 metrics-constants-protos(minSdkVersion:current)
-modules-utils-backgroundthread(minSdkVersion:29)
 modules-utils-build(minSdkVersion:29)
 modules-utils-build_system(minSdkVersion:29)
-modules-utils-handlerexecutor(minSdkVersion:29)
-modules-utils-list-slice(minSdkVersion:30)
 modules-utils-os(minSdkVersion:30)
-modules-utils-preconditions(minSdkVersion:30)
-modules-utils-shell-command-handler(minSdkVersion:29)
-modules-utils-statemachine(minSdkVersion:29)
 ndk_crtbegin_so.21(minSdkVersion:(no version))
 ndk_crtbegin_so.27(minSdkVersion:(no version))
 ndk_crtend_so.21(minSdkVersion:(no version))
@@ -585,8 +482,6 @@ ndk_libc++abi(minSdkVersion:(no version))
 ndk_libc++abi(minSdkVersion:16)
 ndk_libunwind(minSdkVersion:16)
 net-utils-device-common(minSdkVersion:29)
-net-utils-device-common-netlink(minSdkVersion:29)
-net-utils-device-common-struct(minSdkVersion:29)
 net-utils-framework-common(minSdkVersion:current)
 net-utils-services-common(minSdkVersion:30)
 netd-client(minSdkVersion:29)
@@ -595,22 +490,17 @@ netd_aidl_interface-lateststable-java(minSdkVersion:29)
 netd_aidl_interface-V3-java(minSdkVersion:29)
 netd_aidl_interface-V5-java(minSdkVersion:29)
 netd_aidl_interface-V6-java(minSdkVersion:29)
-netd_aidl_interface-V7-java(minSdkVersion:29)
 netd_event_listener_interface-java(minSdkVersion:29)
 netd_event_listener_interface-lateststable-java(minSdkVersion:29)
 netd_event_listener_interface-ndk_platform(minSdkVersion:29)
 netd_event_listener_interface-V1-java(minSdkVersion:29)
-netd_event_listener_interface-V1-ndk(minSdkVersion:29)
 netd_event_listener_interface-V1-ndk_platform(minSdkVersion:29)
 netlink-client(minSdkVersion:29)
 networkstack-aidl-interfaces-V10-java(minSdkVersion:29)
-networkstack-aidl-interfaces-V11-java(minSdkVersion:29)
-networkstack-aidl-interfaces-V12-java(minSdkVersion:29)
 networkstack-client(minSdkVersion:29)
 NetworkStackApi29Shims(minSdkVersion:29)
 NetworkStackApi30Shims(minSdkVersion:29)
 NetworkStackApi31Shims(minSdkVersion:29)
-NetworkStackApi32Shims(minSdkVersion:29)
 NetworkStackApiCurrentShims(minSdkVersion:29)
 NetworkStackApiStableLib(minSdkVersion:29)
 NetworkStackApiStableShims(minSdkVersion:29)
@@ -626,7 +516,6 @@ neuralnetworks_utils_hal_aidl(minSdkVersion:30)
 neuralnetworks_utils_hal_common(minSdkVersion:30)
 neuralnetworks_utils_hal_service(minSdkVersion:30)
 note_memtag_heap_async(minSdkVersion:16)
-note_memtag_heap_sync(minSdkVersion:16)
 okhttp(minSdkVersion:31)
 OsuLoginGoogle(minSdkVersion:30)
 perfetto_trace_protos(minSdkVersion:S)
@@ -669,7 +558,6 @@ prebuilt_androidx.collection_collection-ktx-nodeps(minSdkVersion:current)
 prebuilt_androidx.collection_collection-nodeps(minSdkVersion:24)
 prebuilt_androidx.collection_collection-nodeps(minSdkVersion:30)
 prebuilt_androidx.collection_collection-nodeps(minSdkVersion:current)
-prebuilt_androidx.concurrent_concurrent-futures-nodeps(minSdkVersion:24)
 prebuilt_androidx.coordinatorlayout_coordinatorlayout-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.coordinatorlayout_coordinatorlayout-nodeps(minSdkVersion:14)
 prebuilt_androidx.core_core-ktx-nodeps(minSdkVersion:(no version))
@@ -685,8 +573,6 @@ prebuilt_androidx.documentfile_documentfile-nodeps(minSdkVersion:14)
 prebuilt_androidx.drawerlayout_drawerlayout-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.drawerlayout_drawerlayout-nodeps(minSdkVersion:14)
 prebuilt_androidx.dynamicanimation_dynamicanimation-nodeps(minSdkVersion:14)
-prebuilt_androidx.emoji2_emoji-nodeps(minSdkVersion:14)
-prebuilt_androidx.emoji2_emoji2-views-helpe-nodeps(minSdkVersion:14)
 prebuilt_androidx.fragment_fragment-ktx-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.fragment_fragment-ktx-nodeps(minSdkVersion:14)
 prebuilt_androidx.fragment_fragment-nodeps(minSdkVersion:(no version))
@@ -761,17 +647,11 @@ prebuilt_androidx.recyclerview_recyclerview-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.recyclerview_recyclerview-nodeps(minSdkVersion:14)
 prebuilt_androidx.recyclerview_recyclerview-selection-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.recyclerview_recyclerview-selection-nodeps(minSdkVersion:14)
-prebuilt_androidx.resourceinspection_resourceinspection-annotation-nodeps(minSdkVersion:24)
-prebuilt_androidx.room_room-common-nodeps(minSdkVersion:24)
-prebuilt_androidx.room_room-runtime-nodeps(minSdkVersion:14)
 prebuilt_androidx.savedstate_savedstate-ktx-nodeps(minSdkVersion:14)
 prebuilt_androidx.savedstate_savedstate-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.savedstate_savedstate-nodeps(minSdkVersion:14)
 prebuilt_androidx.slidingpanelayout_slidingpanelayout-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.slidingpanelayout_slidingpanelayout-nodeps(minSdkVersion:14)
-prebuilt_androidx.sqlite_sqlite-framework-nodeps(minSdkVersion:14)
-prebuilt_androidx.sqlite_sqlite-nodeps(minSdkVersion:14)
-prebuilt_androidx.startup_startup-runtime-nodeps(minSdkVersion:14)
 prebuilt_androidx.swiperefreshlayout_swiperefreshlayout-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.swiperefreshlayout_swiperefreshlayout-nodeps(minSdkVersion:14)
 prebuilt_androidx.tracing_tracing-nodeps(minSdkVersion:14)
@@ -786,8 +666,6 @@ prebuilt_androidx.versionedparcelable_versionedparcelable-nodeps(minSdkVersion:1
 prebuilt_androidx.viewpager2_viewpager2-nodeps(minSdkVersion:14)
 prebuilt_androidx.viewpager_viewpager-nodeps(minSdkVersion:(no version))
 prebuilt_androidx.viewpager_viewpager-nodeps(minSdkVersion:14)
-prebuilt_androidx.window_window-nodeps(minSdkVersion:14)
-prebuilt_androidx.work_work-runtime-nodeps(minSdkVersion:14)
 prebuilt_asm-7.0(minSdkVersion:current)
 prebuilt_asm-commons-7.0(minSdkVersion:current)
 prebuilt_asm-tree-7.0(minSdkVersion:current)
@@ -795,9 +673,6 @@ prebuilt_com.google.android.material_material-nodeps(minSdkVersion:(no version))
 prebuilt_com.google.android.material_material-nodeps(minSdkVersion:14)
 prebuilt_error_prone_annotations(minSdkVersion:(no version))
 prebuilt_error_prone_annotations(minSdkVersion:current)
-prebuilt_glide-prebuilt(minSdkVersion:14)
-prebuilt_guava-listenablefuture-prebuilt-jar(minSdkVersion:29)
-prebuilt_guava-listenablefuture-prebuilt-jar(minSdkVersion:current)
 prebuilt_kotlin-stdlib(minSdkVersion:current)
 prebuilt_kotlinx-coroutines-android-nodeps(minSdkVersion:(no version))
 prebuilt_kotlinx-coroutines-android-nodeps(minSdkVersion:current)
@@ -809,19 +684,16 @@ prebuilt_libclang_rt.builtins-i686-android(minSdkVersion:(no version))
 prebuilt_libclang_rt.builtins-x86_64-android(minSdkVersion:(no version))
 prebuilt_libunwind(minSdkVersion:(no version))
 prebuilt_test_framework-sdkextensions(minSdkVersion:(no version))
-resourceobserver_aidl_interface-V1-ndk(minSdkVersion:29)
 resourceobserver_aidl_interface-V1-ndk_platform(minSdkVersion:29)
 server_configurable_flags(minSdkVersion:29)
 ServiceWifiResourcesGoogle(minSdkVersion:30)
 SettingsLibActionBarShadow(minSdkVersion:21)
-SettingsLibActionBarShadow(minSdkVersion:28)
 SettingsLibAppPreference(minSdkVersion:21)
 SettingsLibBarChartPreference(minSdkVersion:21)
 SettingsLibCollapsingToolbarBaseActivity(minSdkVersion:29)
 SettingsLibFooterPreference(minSdkVersion:21)
 SettingsLibHelpUtils(minSdkVersion:21)
 SettingsLibLayoutPreference(minSdkVersion:21)
-SettingsLibMainSwitchPreference(minSdkVersion:28)
 SettingsLibProgressBar(minSdkVersion:21)
 SettingsLibRadioButtonPreference(minSdkVersion:21)
 SettingsLibRestrictedLockUtils(minSdkVersion:21)
@@ -830,13 +702,11 @@ SettingsLibSettingsTheme(minSdkVersion:21)
 SettingsLibSettingsTransition(minSdkVersion:29)
 SettingsLibTwoTargetPreference(minSdkVersion:21)
 SettingsLibUtils(minSdkVersion:21)
-statsd-aidl-ndk(minSdkVersion:30)
 statsd-aidl-ndk_platform(minSdkVersion:(no version))
 statsd-aidl-ndk_platform(minSdkVersion:30)
 statsprotos(minSdkVersion:29)
 tensorflow_headers(minSdkVersion:(no version))
 TetheringApiCurrentLib(minSdkVersion:30)
-textclassifier-java-proto-lite(minSdkVersion:30)
 textclassifier-statsd(minSdkVersion:30)
 textclassifier-statsd(minSdkVersion:current)
 TextClassifierNotificationLibNoManifest(minSdkVersion:29)
diff --git a/build/build_unbundled_mainline_module.sh b/build/build_unbundled_mainline_module.sh
deleted file mode 100755
index 3c7d78b7..00000000
--- a/build/build_unbundled_mainline_module.sh
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/bash -ex
-#
-# Copyright (C) 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-function usage() {
-  cat <<END_OF_USAGE
-This script builds mainline modules. It is used from other build scripts that
-are run on build servers, and is meant to build both AOSP and internal
-variants of the modules.
-
-Basic usage:
-  \$ packages/modules/common/build/build_unbundled_mainline_module.sh \
-      --dist_dir out/dist/mainline_modules_arm64 \
-      --product module_arm64 \
-      -j8
-
-Arguments:
-   --dist_dir <dir>    a dist directory to store the outputs in.
-   --product <product> a target product to use when building.
-   \$@ all other arguments are passed through to soong_ui.bash verbatim.
-END_OF_USAGE
-}
-
-# List of AOSP modules to build if TARGET_BUILD_APPS is not set.
-readonly -a DEFAULT_MODULES=(
-  com.android.adbd
-  com.android.art
-  com.android.art.debug
-  com.android.art.testing
-  com.android.cellbroadcast
-  com.android.conscrypt
-  com.android.extservices
-  com.android.i18n
-  com.android.ipsec
-  com.android.media
-  com.android.mediaprovider
-  com.android.media.swcodec
-  com.android.neuralnetworks
-  # com.android.os.statsd
-  com.android.permission
-  com.android.resolv
-  com.android.runtime
-  com.android.sdkext
-  com.android.telephony
-  com.android.tethering
-  com.android.tzdata
-  com.android.wifi
-  test1_com.android.tzdata
-  test_com.android.conscrypt
-  test_com.android.media
-  test_com.android.media.swcodec
-  CaptivePortalLogin
-  DocumentsUI
-  ExtServices
-  NetworkPermissionConfig
-  NetworkStack
-  NetworkStackNext
-  PermissionController
-)
-
-# Initializes and parses the command line arguments and environment variables.
-#
-# Do not rely on environment global variables for DIST_DIT and PRODUCT, since
-# the script expects specific values for those, instead of anything that could
-# have been lunch'ed in the terminal.
-function init() {
-  declare -ga ARGV
-  while (($# > 0)); do
-    case $1 in
-    --dist_dir)
-      local -r dist_dir="$2"
-      shift 2
-      ;;
-    --product)
-      local -r product="$2"
-      shift 2
-      ;;
-    --help)
-      usage
-      exit
-      ;;
-    *)
-      ARGV+=("$1")
-      shift 1
-      ;;
-    esac
-  done
-  readonly ARGV
-
-  if [ -z "${dist_dir}" ]; then
-    echo "Expected --dist_dir arg is not provided."
-    exit 1
-  fi
-  if [ -z "${product}" ]; then
-    echo "Expected --product arg is not provided."
-    exit 1
-  fi
-
-  declare -grx DIST_DIR="${dist_dir}"
-  declare -grx TARGET_BUILD_APPS="${TARGET_BUILD_APPS:-${DEFAULT_MODULES[*]}}"
-  declare -grx TARGET_BUILD_DENSITY="${TARGET_BUILD_DENSITY:-alldpi}"
-  declare -grx TARGET_BUILD_TYPE="${TARGET_BUILD_TYPE:-release}"
-  declare -grx TARGET_BUILD_VARIANT="${TARGET_BUILD_VARIANT:-user}"
-  declare -grx TARGET_PRODUCT="${product}"
-
-  # This script cannot handle compressed apexes
-  declare -grx OVERRIDE_PRODUCT_COMPRESSED_APEX=false
-  # Unset to build using PreBuilt SDK.
-  declare -grx UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true
-}
-
-function main() {
-  if [ ! -e "build/make/core/Makefile" ]; then
-    echo "$0 must be run from the top of the Android source tree."
-    exit 1
-  fi
-
-  # Run installclean to remove previous artifacts, so they don't accumulate on
-  # the buildbots.
-  build/soong/soong_ui.bash --make-mode installclean
-
-  build/soong/soong_ui.bash --make-mode "$@" \
-    ALWAYS_EMBED_NOTICES=true \
-    MODULE_BUILD_FROM_SOURCE=true \
-    "${RUN_ERROR_PRONE:+"RUN_ERROR_PRONE=true"}" \
-    apps_only \
-    dist \
-    lint-check
-}
-
-init "$@"
-# The wacky ${foo[@]+"${foo[@]}"}, makes bash correctly pass nothing when an
-# array is empty (necessary prior to bash 4.4).
-main ${ARGV[@]+"${ARGV[@]}"}
diff --git a/build/mainline_modules_arm.sh b/build/mainline_modules_arm.sh
deleted file mode 100644
index a7ba6eb9..00000000
--- a/build/mainline_modules_arm.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -ex
-#
-# Copyright (C) 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Assign to a variable and eval that, since bash ignores any error status from
-# the command substitution if it's directly on the eval line.
-readonly vars="$(TARGET_PRODUCT='' build/soong/soong_ui.bash --dumpvars-mode \
-  --vars="DIST_DIR")"
-eval "${vars}"
-
-packages/modules/common/build/build_unbundled_mainline_module.sh \
-  --product module_arm \
-  --dist_dir "${DIST_DIR}/mainline_modules_arm"
diff --git a/build/mainline_modules_arm64.sh b/build/mainline_modules_arm64.sh
deleted file mode 100644
index 34115aba..00000000
--- a/build/mainline_modules_arm64.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -ex
-#
-# Copyright (C) 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Assign to a variable and eval that, since bash ignores any error status from
-# the command substitution if it's directly on the eval line.
-readonly vars="$(TARGET_PRODUCT='' build/soong/soong_ui.bash --dumpvars-mode \
-  --vars="DIST_DIR")"
-eval "${vars}"
-
-packages/modules/common/build/build_unbundled_mainline_module.sh \
-  --product module_arm64 \
-  --dist_dir "${DIST_DIR}/mainline_modules_arm64"
diff --git a/build/mainline_modules_x86.sh b/build/mainline_modules_x86.sh
deleted file mode 100755
index 5c7847de..00000000
--- a/build/mainline_modules_x86.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -ex
-#
-# Copyright (C) 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Assign to a variable and eval that, since bash ignores any error status from
-# the command substitution if it's directly on the eval line.
-readonly vars="$(TARGET_PRODUCT='' build/soong/soong_ui.bash --dumpvars-mode \
-  --vars="DIST_DIR")"
-eval "${vars}"
-
-packages/modules/common/build/build_unbundled_mainline_module.sh \
-  --product module_x86 \
-  --dist_dir "${DIST_DIR}/mainline_modules_x86"
diff --git a/build/mainline_modules_x86_64.sh b/build/mainline_modules_x86_64.sh
deleted file mode 100755
index ade992be..00000000
--- a/build/mainline_modules_x86_64.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -ex
-#
-# Copyright (C) 2021 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Assign to a variable and eval that, since bash ignores any error status from
-# the command substitution if it's directly on the eval line.
-readonly vars="$(TARGET_PRODUCT='' build/soong/soong_ui.bash --dumpvars-mode \
-  --vars="DIST_DIR")"
-eval "${vars}"
-
-packages/modules/common/build/build_unbundled_mainline_module.sh \
-  --product module_x86_64 \
-  --dist_dir "${DIST_DIR}/mainline_modules_x86_64"
diff --git a/generate_ml_bundle.sh b/generate_ml_bundle.sh
deleted file mode 100755
index 06fd6c47..00000000
--- a/generate_ml_bundle.sh
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/bin/bash -ex
-
-# Usage:
-# generate_ml_bundle.sh [args] source_tree dest_tree api_level
-#
-# Args:
-# -p Sets prefer=true in generated java_sdk_library_import rules
-# -a Also update artifects; default behaviour is just to generate build rules.
-
-PREFER=false
-UPDATE_ARTIFACTS=false
-while getopts "pa" opt; do
-    case ${opt} in
-          p ) PREFER=true;;
-          a ) UPDATE_ARTIFACTS=true;;
-          \? ) echo "Invalid option."
-            exit
-            ;;
-    esac
-done
-shift $((OPTIND -1))
-
-SOURCE_TREE=$1
-DESTINATION_TREE=$2
-API_LEVEL=$3
-SOURCE_TREE_TYPE=$(test -e ${DESTINATION_TREE}/vendor/unbundled_google/modules && echo GOOGLE || echo PARTNER)
-
-function sdk_lib_bp() {
-    modulename=$1
-    apexname=$2
-    shared_library=$(test \( "$apexname" == com.android.ipsec \) -a \( "$API_LEVEL" -lt 31 \) && echo true || echo false)
-    cat << EOF
-java_sdk_library_import {
-    name: "${modulename}",
-    owner: "google",
-    prefer: ${PREFER},
-    shared_library: ${shared_library},
-    apex_available: [
-        "${apexname}",
-        "test_${apexname}",
-    ],
-    public: {
-        jars: ["current/public/${modulename}.jar"],
-        stub_srcs: ["current/public/${modulename}.srcjar"],
-        current_api: "current/public/${modulename}.txt",
-        removed_api: "current/public/${modulename}-removed.txt",
-        sdk_version: "module_current",
-    },
-    system: {
-        jars: ["current/system/${modulename}.jar"],
-        stub_srcs: ["current/system/${modulename}.srcjar"],
-        current_api: "current/system/${modulename}.txt",
-        removed_api: "current/system/${modulename}-removed.txt",
-        sdk_version: "module_current",
-    },
-    module_lib: {
-        jars: ["current/module_lib/${modulename}.jar"],
-        stub_srcs: ["current/module_lib/${modulename}.srcjar"],
-        current_api: "current/module_lib/${modulename}.txt",
-        removed_api: "current/module_lib/${modulename}-removed.txt",
-        sdk_version: "module_current",
-    },
-}
-EOF
-}
-
-function make_sdk_library() {
-    libnames=$1
-    destdir=$2
-    apexname=$3
-    bp=${destdir}/Android.bp
-
-    #test -e "$bp"
-    mkdir -p "$(dirname "$bp")"
-
-    # Remove existing java_sdk_library_import and double newlines
-    existing_bp="$(sed -e '/java_sdk_library_import {/,/^}/d' "$bp" | tr -s \\n)"
-    echo "$existing_bp" > "$bp"
-    for libname in $libnames; do
-        echo >> "$bp"
-        echo "$(sdk_lib_bp ${libname} ${apexname})" | grep -v test_com.android.tethering >> "$bp"
-    done
-    #echo >> "$bp"
-
-    if [ "${UPDATE_ARTIFACTS}" == "true" ] ; then
-        rm -rf "${destdir}/current"
-        mkdir -p "${destdir}/current/"{public,system,module_lib}
-        for libname in $libnames; do
-            cp public/{${libname}.jar,api/${libname}.txt,api/${libname}-removed.txt} "${destdir}/current/public"
-            cp system/{${libname}.jar,api/${libname}.txt,api/${libname}-removed.txt} "${destdir}/current/system"
-            cp module-lib/{${libname}.jar,api/${libname}.txt,api/${libname}-removed.txt} "${destdir}/current/module_lib"
-        done
-    fi
-}
-
-function copy_notices() {
-    destdir=$1
-    apks=$(find $destdir -name '*.apks' | head -1)
-    if [[ -z "$apks" ]]; then
-        echo "no apks found in $destdir" >&2
-        exit
-    fi
-    filename=$(zipinfo -1 "$apks" *.apex */base-master.apk | head -1)
-    # com.android.ipsec is not expected to have a LICENSE, so don't fail if it doesn't.
-    unzip -p "$apks" "$filename" | bsdtar -xOf- assets/NOTICE.html.gz > "${destdir}/NOTICE.html.gz" || test "$2" == "com.android.ipsec"
-}
-
-function get_dest_dir() {
-    if [[ "$SOURCE_TREE_TYPE" == "PARTNER" ]]; then
-        echo "${DESTINATION_TREE}/vendor/partner_modules/${1}"
-    elif [[ "$SOURCE_TREE_TYPE" == "GOOGLE" ]]; then
-        echo -n "${DESTINATION_TREE}/prebuilts/module_sdk/"
-        case "$1" in
-            "IKEPrebuilt") echo "IPsec";;
-            "MediaFrameworkPrebuilt") echo "Media";;
-            "MediaProviderPrebuilt") echo "MediaProvider";;
-            "PermissionControllerPrebuilt") echo "Permission";;
-            "SdkExtensionsPrebuilt") echo "SdkExtensions";;
-            "StatsdPrebuilt") echo "StatsD";;
-            "TetheringPrebuilt") echo "Connectivity";;
-            "WiFiPrebuilt") echo "Wifi";;
-            *) exit 1;;
-        esac
-    else
-        # Unknown tree type
-        exit 2
-    fi
-    #ConscryptPrebuilt ???
-}
-
-function setup_stub_prebuilts() {
-    destdir=$(get_dest_dir $2)
-
-    make_sdk_library "$1" "$destdir" "$3"
-    #copy_notices "$destdir" "$3"
-}
-
-cd "$SOURCE_TREE/prebuilts/sdk/$API_LEVEL"
-setup_stub_prebuilts android.net.ipsec.ike IKEPrebuilt com.android.ipsec
-setup_stub_prebuilts framework-media MediaFrameworkPrebuilt com.android.media
-setup_stub_prebuilts framework-mediaprovider MediaProviderPrebuilt com.android.mediaprovider
-if [[ "$API_LEVEL" -ge 31 ]]; then
-    setup_stub_prebuilts 'framework-permission framework-permission-s' PermissionControllerPrebuilt com.android.permission
-else
-    setup_stub_prebuilts framework-permission PermissionControllerPrebuilt com.android.permission
-fi
-setup_stub_prebuilts framework-sdkextensions SdkExtensionsPrebuilt com.android.sdkext
-setup_stub_prebuilts framework-statsd StatsdPrebuilt com.android.os.statsd
-setup_stub_prebuilts framework-tethering TetheringPrebuilt com.android.tethering
-setup_stub_prebuilts framework-wifi WiFiPrebuilt com.android.wifi
diff --git a/proguard/Android.bp b/proguard/Android.bp
deleted file mode 100644
index e011a61d..00000000
--- a/proguard/Android.bp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright (C) 2021 The Android Open Source Project
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package {
-    default_applicable_licenses: ["Android-Apache-2.0"],
-    default_visibility: [
-        ":__subpackages__",
-        "//packages/modules/Permission:__subpackages__",
-    ],
-}
-
-// Needed because otherwise java_defaults would resolve it in module directory.
-filegroup {
-    name: "framework-system-server-module-optimize-proguard-rules",
-    srcs: [
-        "system-api.pro",
-    ],
-}
-
-java_defaults {
-    name: "framework-system-server-module-optimize-defaults",
-    optimize: {
-        enabled: true,
-        shrink: true,
-        optimize: false,
-        obfuscate: false,
-        proguard_flags_files: [":framework-system-server-module-optimize-proguard-rules"],
-    },
-}
diff --git a/proguard/system-api.pro b/proguard/system-api.pro
deleted file mode 100644
index 6e08c503..00000000
--- a/proguard/system-api.pro
+++ /dev/null
@@ -1,13 +0,0 @@
--keep @interface android.annotation.SystemApi
--keep @android.annotation.SystemApi public class * {
-    public protected *;
-}
--keepclasseswithmembers public class * {
-    @android.annotation.SystemApi public protected <fields>;
-}
--keepclasseswithmembers public class * {
-    @android.annotation.SystemApi public protected <init>(...);
-}
--keepclasseswithmembers public class * {
-    @android.annotation.SystemApi public protected <methods>;
-}
diff --git a/proto/classpaths.proto b/proto/classpaths.proto
index fef62d2d..bbecdcb6 100644
--- a/proto/classpaths.proto
+++ b/proto/classpaths.proto
@@ -26,8 +26,11 @@ enum Classpath {
 // Individual entry in a classpath variable.
 message Jar {
 
-  // Path on the filesystem for the jar.
-  string path = 1;
+  // Path on the filesystem for the jar, relative to the partition.
+  // For example, for APEX "com.android.myapex", relative_path of
+  // `javalib/myjar.jar` would correspond to an absolute path of
+  // `/apex/com.android.myapex/javalib/myjar.jar` at runtime.
+  string relative_path = 1;
 
   // Environ classpath variable this jar belongs to.
   // Must be set to a known classpath.
@@ -43,7 +46,7 @@ message Jar {
   // Maximum API level that the jar file supports.
   // Not setting this attribute implies unbound maximum; otherwise set value
   // must be greater or equal to min_sdk value.
-  // If the system's API level is higher than the value specified in this
+  // If the system's API level is higher that the value specified in this
   // attribute, the jar will not be included in the classpath.
   int32 max_sdk_version = 4;
 }
diff --git a/proto/sdk.proto b/proto/sdk.proto
index 4fddf8df..1e37dbc9 100644
--- a/proto/sdk.proto
+++ b/proto/sdk.proto
@@ -26,7 +26,6 @@ enum SdkModule {
   UNKNOWN = 0;
 
   // R modules
-  CONSCRYPT = 10;
   IPSEC = 1;
   MEDIA = 2;
   MEDIA_PROVIDER = 3;
@@ -37,7 +36,6 @@ enum SdkModule {
 
   // S modules
   ART = 8;
-  SCHEDULING = 9;
 }
 
 // A single extension version.
diff --git a/sdk/ModuleDefaults.bp b/sdk/ModuleDefaults.bp
index 877d9796..c0bf060c 100644
--- a/sdk/ModuleDefaults.bp
+++ b/sdk/ModuleDefaults.bp
@@ -30,8 +30,7 @@ mainline_stubs_args =
     "--hide SdkConstant " +
     "--hide Todo " +
     "--hide Typo " +
-    "--hide UnavailableSymbol " +
-    "--enhance-documentation "
+    "--hide UnavailableSymbol "
 
 // TODO: modularize this so not every module has the same list
 framework_packages_to_document = [
@@ -77,14 +76,8 @@ mainline_service_stubs_args =
 java_defaults {
     name: "framework-module-common-defaults",
 
-    // Use the source of annotations that affect metalava doc generation, since
-    // the relevant generation instructions are themselves in javadoc, which is
-    // not present in class files.
-    api_srcs: [":framework-metalava-annotations"],
-
-    // Make the source retention annotations available on the classpath when compiling
-    // the implementation library. (This should be in impl_only_libs but some modules
-    // use these defaults for java_library, sigh.)
+    // Additional annotations used for compiling both the implementation and the
+    // stubs libraries.
     libs: ["framework-annotations-lib"],
 
     // Framework modules are not generally shared libraries, i.e. they are not
@@ -133,8 +126,6 @@ java_defaults {
 
     // Collates API usages from each module for further analysis.
     plugins: ["java_api_finder"],
-
-    dist_group: "android",
 }
 
 // Defaults for mainline module provided java_sdk_library instances.
diff --git a/tools/Android.bp b/tools/Android.bp
index 8f0f5296..66567ea3 100644
--- a/tools/Android.bp
+++ b/tools/Android.bp
@@ -49,28 +49,13 @@ gensrcs {
     name: "cur_sdkinfo_src",
     srcs: [""],
     tools: [ "gen_sdkinfo" ],
-    product_variables: {
-        platform_sdk_extension_version: {
-            cmd: "$(location) -v %d -o $(out)",
-        }
-    }
+    cmd: "$(location) -v 0 -o $(out)",
 }
 
 prebuilt_etc {
-    name: "current_sdkinfo",
+    name: "cur_sdkinfo",
     src: ":cur_sdkinfo_src",
-    filename: "sdkinfo.pb",
+    filename: "sdkinfo.binarypb",
     installable: false,
-    visibility: [
-        "//art:__subpackages__",
-        "//external/conscrypt:__subpackages__",
-        "//frameworks/av/apex:__subpackages__",
-        "//packages/modules/Connectivity:__subpackages__",
-        "//packages/modules/IPsec/apex:__subpackages__",
-        "//packages/modules/Permission:__subpackages__",
-        "//packages/modules/Scheduling:__subpackages__",
-        "//packages/modules/SdkExtensions:__subpackages__",
-        "//packages/modules/StatsD:__subpackages__",
-        "//packages/providers/MediaProvider:__subpackages__",
-    ],
+    visibility: ["//packages/modules/SdkExtensions"],
 }
diff --git a/tools/check_allowed_deps.py b/tools/check_allowed_deps.py
deleted file mode 100755
index 12ea30d1..00000000
--- a/tools/check_allowed_deps.py
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/usr/bin/python3
-""" Script to enforce certain requirements on commits that modify allowed_deps.txt
-
-For more info, go/apex-allowed-deps-error
-"""
-
-import re
-import subprocess
-import sys
-
-sha = sys.argv[1]
-
-AllowedDepsTxt = "build/allowed_deps.txt"
-
-DisableAllowedDepsCheckKey = "No-Allowed-Deps-Check"
-ExpectedKeys = set(["Apex-Size-Increase", "Previous-Platform-Support", "Aosp-First", "Test-Info"])
-
-def get_deps(allowed_deps):
-  """ Parse allowed_deps.txt contents returning just dependency names """
-  deps = set()
-  for line in allowed_deps:
-    if line.startswith('#'):
-      continue
-    if len(line.strip()) == 0:
-      continue
-    dep = line[:line.find("(")]
-    deps.add(dep)
-  return deps
-
-
-commit_msg = subprocess.run(["git", "show", "--no-patch", "--format=%B", sha],
-  capture_output=True, check=True, text=True).stdout.splitlines()
-
-commit_msg_keys = set()
-for line in commit_msg:
-  key_match = re.match(r'(\S+):', line)
-  if key_match:
-    commit_msg_keys.add(key_match.group(1))
-if DisableAllowedDepsCheckKey in commit_msg_keys:
-  # we are disabled
-  sys.exit(0)
-
-missing_keys = ExpectedKeys - commit_msg_keys
-
-if not missing_keys:
-  # Nothing to verify
-  sys.exit(0)
-
-
-git_show = subprocess.run(["git", "show", "--name-only", "--format=", sha],
-  capture_output=True, check=True, text=True)
-files = set(git_show.stdout.split("\n"))
-if AllowedDepsTxt not in files:
-  # nothing to check
-  sys.exit(0)
-
-before = subprocess.run(["git", "show", "%s^:%s" % (sha, AllowedDepsTxt)],
-  capture_output=True, check=True, text=True).stdout.splitlines()
-after = subprocess.run(["git", "show", "%s:%s" % (sha, AllowedDepsTxt)],
-  capture_output=True, check=True, text=True).stdout.splitlines()
-
-
-before_deps = get_deps(before)
-after_deps = get_deps(after)
-added = after_deps - before_deps
-if len(added) == 0:
-  # no new deps added, all good. Maybe just some minSdkVersion changed.
-  sys.exit(0)
-
-sys.stderr.write(
-"""
-\033[91m\033[1mError:\033[0m\033[1m You have added to allowed_deps.txt without providing necessary extra information\033[0m
-
-Added deps:
-%s
-
-Missing information from the commit message:
-%s
-
-See go/apex-allowed-deps-error for more details.
-
-To disable this check, please add "%s: <reason>" to your commit message.
-""" % (
-  "\n".join([("  %s" % a) for a in added]),
-  "\n".join([("  %s:" % k) for k in missing_keys]),
-  DisableAllowedDepsCheckKey
-  ))
-sys.exit(1)
diff --git a/tools/finalize_sdk.py b/tools/finalize_sdk.py
deleted file mode 100755
index c862d892..00000000
--- a/tools/finalize_sdk.py
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/python3
-
-import argparse
-import os
-import re
-import subprocess
-import sys
-import tempfile
-import zipfile
-
-from collections import defaultdict
-
-# See go/fetch_artifact for details on this script.
-FETCH_ARTIFACT = '/google/data/ro/projects/android/fetch_artifact'
-BUILD_TARGET = 'mainline_modules-userdebug'
-ARTIFACT_PATTERN = 'mainline-sdks/*-%d.zip'
-COMMIT_TEMPLATE = """Finalize artifacts for extension SDK %d
-
-Import from build id %s.
-
-Generated with:
-$ %s
-
-Bug: %d
-Test: presubmit"""
-
-def fail(*args, **kwargs):
-    print(*args, file=sys.stderr, **kwargs)
-    sys.exit(1)
-
-def fetch_artifacts(target, build_id, artifact_path):
-    tmpdir = tempfile.TemporaryDirectory().name
-    os.mkdir(tmpdir)
-    print('Fetching %s from %s ...' % (artifact_path, target))
-    fetch_cmd = [FETCH_ARTIFACT]
-    fetch_cmd.extend(['--bid', str(build_id)])
-    fetch_cmd.extend(['--target', target])
-    fetch_cmd.append(artifact_path)
-    fetch_cmd.append(tmpdir)
-    print("Running: " + ' '.join(fetch_cmd))
-    try:
-        subprocess.check_output(fetch_cmd, stderr=subprocess.STDOUT)
-    except subprocess.CalledProcessError:
-        fail('FAIL: Unable to retrieve %s artifact for build ID %s' % (artifact_path, build_id))
-    return tmpdir
-
-def repo_for_sdk(filename):
-    module = filename.split('-')[0]
-    target_dir = ''
-    if module == 'media': return 'prebuilts/module_sdk/Media'
-    if module == 'tethering': return 'prebuilts/module_sdk/Connectivity'
-    for dir in os.listdir('prebuilts/module_sdk/'):
-        if module.lower() in dir.lower():
-            if target_dir:
-                fail('Multiple target dirs matched "%s": %s' % (module, (target_dir, dir)))
-            target_dir = dir
-    if not target_dir:
-        fail('Could not find a target dir for %s' % filename)
-
-    return 'prebuilts/module_sdk/%s' % target_dir
-
-def dir_for_sdk(filename, version):
-    base = str(version)
-    if 'test-exports' in filename:
-        return os.path.join(base, 'test-exports')
-    if 'host-exports' in filename:
-        return os.path.join(base, 'host-exports')
-    return base
-
-if not os.path.isdir('build/soong'):
-    fail("This script must be run from the top of an Android source tree.")
-
-parser = argparse.ArgumentParser(description=('Finalize an extension SDK with prebuilts'))
-parser.add_argument('-f', '--finalize_sdk', type=int, required=True, help='The numbered SDK to finalize.')
-parser.add_argument('-b', '--bug', type=int, required=True, help='The bug number to add to the commit message.')
-parser.add_argument('-a', '--amend_last_commit', action="store_true", help='Amend current HEAD commits instead of making new commits.')
-parser.add_argument('bid', help='Build server build ID')
-args = parser.parse_args()
-
-branch_name = 'finalize-%d' % args.finalize_sdk
-cmdline = " ".join(filter(lambda x: x not in ['-a', '--amend_last_commit'], sys.argv))
-commit_message = COMMIT_TEMPLATE % (args.finalize_sdk, args.bid, cmdline, args.bug)
-
-tmpdir = fetch_artifacts(BUILD_TARGET, args.bid, ARTIFACT_PATTERN % args.finalize_sdk)
-
-created_dirs = defaultdict(list)
-
-for f in os.listdir(tmpdir):
-    repo = repo_for_sdk(f)
-    dir = dir_for_sdk(f, args.finalize_sdk)
-    target_dir = os.path.join(repo, dir)
-    if os.path.isfile(target_dir):
-        print('Removing existing dir %s' % target_dir)
-        shutil.rmtree(target_dir)
-    with zipfile.ZipFile(os.path.join(tmpdir, f)) as zipFile:
-        zipFile.extractall(target_dir)
-
-    print('Created %s' % target_dir)
-    created_dirs[repo].append(dir)
-
-subprocess.check_output(['repo', 'start', branch_name] + list(created_dirs.keys()))
-print('Running git commit')
-for repo in created_dirs:
-    git = ['git', '-C', repo]
-    subprocess.check_output(git + ['add'] + created_dirs[repo])
-    if args.amend_last_commit:
-        change_id = '\n' + re.search(r'Change-Id: [^\\n]+', str(subprocess.check_output(git + ['log', '-1']))).group(0)
-        subprocess.check_output(git + ['commit', '--amend', '-m', commit_message + change_id])
-    else:
-        subprocess.check_output(git + ['commit', '-m', commit_message])