am c5db017c: am 63b2c577: Merge "Conditionally use SIGSTKFLT"

* commit 'c5db017cc3d30b1b15544ca9889e66890710f93c':
  Conditionally use SIGSTKFLT