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

Change-Id: I8b213db27f67f7ed9ca9edd08990226fd860078a