Merge "Increase the size of the signal stack on 64-bit."
am: 8fd93e6ea5

Change-Id: I1647bcea8c54000287a25b897e2de658e7cf5306