Merge "Fix #2 for dexopt_test now that '&' is not a valid class loader context." am: c374340c82 am: 73bbda19db

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1655677

Change-Id: I20bdfb137b394814522f48e0c294d9880ff0e232