am dda34f53: am 42f40659: Merge "Disable new longjmp in glibc 2.11 and later."

Merge commit 'dda34f535d01518e44564a9cde525b768042cf90'

* commit 'dda34f535d01518e44564a9cde525b768042cf90':
  Disable new longjmp in glibc 2.11 and later.