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

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



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