Merge "Force stack alignment for external calls for x86"