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

* commit '8a50a4aa4636bdc3e0443ea94f5042db18c03ed2':
  Change IllegalAccess/IncompatibleClassChange order.