am 4800da15: Merge "Fix remaining 64bit calling convention issues and cleanup."

* commit '4800da1566d0e91dfa34e0729e6b36ca60e93f7f':
  Fix remaining 64bit calling convention issues and cleanup.