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