Merge "Make dex file verifier check for dups between direct and virtual methods."