am ad064403: am 6e37ebfe: am 6c83305c: Merge "Rethrow SIGTRAP too."

* commit 'ad064403363cf1cafc497ef8a086184318d5e6cf':
  Rethrow SIGTRAP too.