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

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

Change-Id: I269a3e7c6c00008ae319741fdfc25a13773e2078