Merge "vdex optimization: avoid doing application type resolution."