Merge "Fix #2 for dexopt_test now that '&' is not a valid class loader context."