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

Change-Id: I38661574ba316b52be1f13116fd8252560b72b92