am 5cba3c6f: Merge "Fix signal trampolines."

* commit '5cba3c6f8e571cd4e6e2468263b778a90331101f':
  Fix signal trampolines.