am 79737802: am 8268a75e: am c5db017c: am 63b2c577: Merge "Conditionally use SIGSTKFLT"

* commit '79737802421d7b32707f1c248b5ecb239965234a':
  Conditionally use SIGSTKFLT