Merge "Change IllegalAccess/IncompatibleClassChange order."