Merge "Do not resolve types with vdex."