Merge "ART: kSuper also has IncompatibleClassChangeError"