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

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