Merge "x86: restore standard stack frame layout and fix stack alignment."