Merge branch 'master' into nuget_armel

diff --cc src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
index f982188,380513a..73bebe0
--- 1/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
--- 2/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
+++ b/src/.nuget/Microsoft.NETCore.Runtime.CoreCLR/debian/Microsoft.NETCore.Runtime.CoreCLR.pkgproj
@@@ -17,9 -17,7 +17,7 @@@
      <NativeSplittableBinary Include="$(BinDir)libsosplugin.so" />
      <NativeSplittableBinary Include="$(BinDir)System.Globalization.Native.so" />
      <ArchitectureSpecificNativeFile Include="$(BinDir)sosdocsunix.txt" />
-     <ArchitectureSpecificNativeFile Condition="'$(PackagePlatform)' != 'armel'" Include="$(BinDir)mscorlib.ni.dll" />
 -    <ArchitectureSpecificNativeFile Include="$(BinDir)System.Private.CoreLib.ni.dll" />
 +    <ArchitectureSpecificNativeFile Condition="'$(PackagePlatform)' != 'armel'" Include="$(BinDir)System.Private.CoreLib.ni.dll" />
-     <ArchitectureSpecificLibFile Include="$(BinDir)mscorlib.dll" />
      <ArchitectureSpecificLibFile Include="$(BinDir)System.Private.CoreLib.dll" />
      <ArchitectureSpecificLibFile Include="$(BinDir)SOS.NETCore.dll" />
      <ArchitectureSpecificToolFile Include="$(BinDir)crossgen" />