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

* commit '8268a75e86c086c4618c2f8d8e9531eb8d7b30f5':
  Conditionally use SIGSTKFLT