Fix build errors due to merge conflicts
authorSantiago Fernandez Madero <safern@microsoft.com>
Thu, 11 Apr 2019 23:08:05 +0000 (16:08 -0700)
committerSantiago Fernandez Madero <safern@microsoft.com>
Thu, 11 Apr 2019 23:08:05 +0000 (16:08 -0700)
commitf55a64761b32c18388714d5de40c730531c0883c
treec5dd3f51d3b13deae26c99c897078cbfe77fb321
parentcabadde24f78898aef7d31a872c58969e3365fa0
Fix build errors due to merge conflicts

Commit migrated from https://github.com/dotnet/coreclr/commit/e65ab1c53b8e234c77d9746a91e9a9c03aecb335
src/coreclr/src/System.Private.CoreLib/src/System/Reflection/Assembly.CoreCLR.cs
src/coreclr/src/System.Private.CoreLib/src/System/Reflection/AssemblyName.CoreCLR.cs
src/coreclr/src/System.Private.CoreLib/src/System/Reflection/RuntimeAssembly.cs
src/libraries/System.Private.CoreLib/src/System/Reflection/AssemblyName.cs
src/libraries/System.Private.CoreLib/src/System/Runtime/CompilerServices/RuntimeHelpers.cs
src/libraries/System.Private.CoreLib/src/System/Runtime/Loader/AssemblyLoadContext.cs
src/libraries/System.Private.CoreLib/src/System/Threading/TimerQueue.Windows.cs