Merge "Revert "Switch to libc++ prebuilt"" into main am: 90b7726c

Original change: https://android-review.googlesource.com/c/platform/packages/modules/common/+/3061873



Change-Id: I2450c9d31724a416504ec88c7146648f6f5d14e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

build/allowed_deps.txt

@@ -523,6 +523,10 @@ libbtcore_headers(minSdkVersion:30)
 libbuildversion(minSdkVersion:(no version))
 libbuildversion(minSdkVersion:26)
 libbytes(minSdkVersion:29)
+libc++(minSdkVersion:apex_inherit)
+libc++_static(minSdkVersion:apex_inherit)
+libc++abi(minSdkVersion:apex_inherit)
+libc++demangle(minSdkVersion:apex_inherit)
 libc++fs(minSdkVersion:apex_inherit)
 libc_headers(minSdkVersion:apex_inherit)
 libc_headers_arch(minSdkVersion:apex_inherit)
@@ -1488,9 +1492,6 @@ prebuilt_kotlinx-coroutines-android-nodeps(minSdkVersion:current)
 prebuilt_kotlinx-coroutines-core-nodeps(minSdkVersion:(no version))
 prebuilt_kotlinx-coroutines-core-nodeps(minSdkVersion:current)
 prebuilt_libasync_safe(minSdkVersion:(no version))
-prebuilt_libc++(minSdkVersion:(no version))
-prebuilt_libc++_static(minSdkVersion:(no version))
-prebuilt_libc++demangle(minSdkVersion:(no version))
 prebuilt_libc_headers(minSdkVersion:(no version))
 prebuilt_libcap(minSdkVersion:(no version))
 prebuilt_libclang_rt.builtins(minSdkVersion:(no version))