Merge "x86/x86-64: Fix suspend entrypoint assembly for Mac build."