Merge "Revert^12 "Enable dex container (DEX v41) for the whole system"" into main am: 9d96d1f1

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3212295



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