Merge "Fix stacks on 64 bit processes."
am: aea79fa207

Change-Id: I67828f33969225c3c61c50f533b2a2a77f9bb78c