Merge remote-tracking branch 'upstream/master' into ibc-support

# Conflicts:
#	build.cmd
#	build.sh

build.cmd

@@ -457,14 +457,6 @@ if %__BuildNativeCoreLib% EQU 1 (
         goto CrossgenFailure
     )
 
-    echo %__MsgPrefix%Generating native image of MScorlib facade for %__BuildOS%.%__BuildArch%.%__BuildType%
-
-    set "__CrossGenCoreLibLog=%__LogsDir%\CrossgenMSCoreLib_%__BuildOS%__%__BuildArch%__%__BuildType%.log"
-    set "__CrossgenExe=%__CrossComponentBinDir%\crossgen.exe"
-
-    "!__CrossgenExe!" %__IbcTuning% /Platform_Assemblies_Paths "%__BinDir%" /out "%__BinDir%\mscorlib.ni.dll" "%__BinDir%\mscorlib.dll" > "!__CrossGenCoreLibLog!" 2>&1
-    set err=!errorlevel!
-
     if "%__CompatJitCrossgen%"=="1" (
         set COMPlus_UseWindowsX86CoreLegacyJit=
     )

build.sh

@@ -373,13 +373,6 @@ build_CoreLib_ni()
             exit 1
         fi
 
-        echo "Generating native image for MScorlib Facade."
-        $__BinDir/crossgen $__IbcTuning $__BinDir/mscorlib.dll
-        if [ $? -ne 0 ]; then
-            echo "Failed to generate native image for mscorlib facade."
-            exit 1
-        fi
-
         if [ "$__BuildOS" == "Linux" ]; then
             echo "Generating symbol file for System.Private.CoreLib."
             $__BinDir/crossgen /CreatePerfMap $__BinDir $__BinDir/System.Private.CoreLib.ni.dll