am 14a67c7e: am be5e8f72: Merge "Stack tool 32/64 bit compatibility fixes."

* commit '14a67c7e703553eaf722514f7e2e6eda48922819':
  Stack tool 32/64 bit compatibility fixes.