Fix non-aot pscorlib build
Merge remote-tracking branch 'origin/master' into cbroglie-comparison-fixes