Merge "Dexpreopt: prepare to merge class loader context from all deps." am:...

Merge "Dexpreopt: prepare to merge class loader context from all deps." am: 3eff61ca am: a7d23f9e am: 043f1371

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



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