Merge pull request dotnet/coreclr#4688 from dotnet-bot/from-tfs

Merge changes from TFS

Commit migrated from https://github.com/dotnet/coreclr/commit/7dd56b48bd99a776e8e7dd3638f59191c5013e9b

diff --cc src/coreclr/src/jit/compiler.h
Simple merge

diff --cc src/coreclr/src/jit/importer.cpp
Simple merge

diff --cc src/coreclr/src/vm/jitinterface.cpp
Simple merge

diff --cc src/coreclr/src/zap/zapinfo.cpp
Simple merge