Merge "CheckAndClearResolveException should allow LinkageError"