Merge "Generalize vdex class redefinition check"