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

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