am ac5abd68: am 28faa949: am 39d51c9a: am eb96f654: am bc6a6036: Merge "Fix the stack/ tool for 64 bit archs."

* commit 'ac5abd6882aa8ea53097eeba0420e1ab42e574eb':