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

Change-Id: I7dc15782a75d824afc99fc9632083359d9c00e0b