Merge pull request #2777 from xmcclure/win-makefile-aotcheck