Fix the merge from the corert changes
authorTarek Mahmoud Sayed <tarekms@microsoft.com>
Thu, 6 Jul 2017 00:37:58 +0000 (17:37 -0700)
committerTarek Mahmoud Sayed <tarekms@microsoft.com>
Thu, 6 Jul 2017 01:06:52 +0000 (18:06 -0700)
commit4e04985c51186fed9b3c7c7ff1ad04755f5f38a8
tree55976b143434907fee3b5b8c4af0e1eaf9852da1
parent18628e17681e4802f52f1bf34f3ea6548ea73fc1
Fix the merge from the corert changes

Commit migrated from https://github.com/dotnet/coreclr/commit/d11d281a2141bb6880371d878d558859c56f4901
src/coreclr/src/mscorlib/System.Private.CoreLib.csproj
src/coreclr/src/mscorlib/shared/System/Text/Encoding.cs
src/coreclr/src/mscorlib/src/System/Text/Encoding.cs [deleted file]
src/coreclr/src/mscorlib/src/System/Text/Latin1Encoding.cs [deleted file]
src/coreclr/src/mscorlib/src/System/Text/UTF7Encoding.cs [deleted file]