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 am: 61db984a

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



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