am 371b6dbe: Merge "ptrace(3) should be varargs"

* commit '371b6dbef621f318b1d94b59b8472b3aeaae9dcf':
  ptrace(3) should be varargs