am a7e2ac3f: am 8a50a4aa: Merge "Change IllegalAccess/IncompatibleClassChange order."

* commit 'a7e2ac3f5744f59aa2503c04ff49410bc5a2af87':
  Change IllegalAccess/IncompatibleClassChange order.