Merge "ART: Dex file verifier can't blindly use GetDescriptor"