am 2af4186c: am 5865da7b: Merge "Remove libunwind-ptrace dependency."

* commit '2af4186c4d832336417354b3b3e1114af20a2645':
  Remove libunwind-ptrace dependency.