Merge "ART: Fix IncompatibleClassChange check for ArtMethod"