Merge "Stop verifier ResolveClass from putting unresolved classes in dex cache."