Merge "ART: kSuper also has IncompatibleClassChangeError" into lmp-dev