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

* commit 'b2634e9790a7099cf84d3509afe7af18f4349f11':
  ART: kSuper also has IncompatibleClassChangeError