Merge "Don't assume resolved type has the same dex cache."