Merge "Generalize vdex class redefinition check" am: 8e1ca6103d
am: 51bdf0731a

Change-Id: I8e0c206db6bb15c53b51088e5ba3118d2a7f7662