Merge "Revert "Dexpreopt: prepare to merge class loader context from al..."" am: 1818a57e

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



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