am eb96f654: am bc6a6036: Merge "Fix the stack/ tool for 64 bit archs."

* commit 'eb96f6540c7f066e9e7e0e81f6ff323cf3c67c8d':
  Fix the stack/ tool for 64 bit archs.