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

Change-Id: If11f07a27482e95ab05014f05f0d47f29697af92