am 643d961e: Merge "Force stack alignment for external calls for x86"

* commit '643d961eca33921e846d1c5846999c1874b18c3a':
  Force stack alignment for external calls for x86