am cfed41d0: am 3d2781d1: Merge "ART: Dex file verifier can\'t blindly use GetDescriptor"

* commit 'cfed41d001c2552c6f0c02ad1e391c080cc9505a':
  ART: Dex file verifier can't blindly use GetDescriptor