Merge pull request #3741 from akoeplinger/fix-aot-DoAssemblyResolve