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

* commit 'e4c4d7ecd666d473251866926823d2cc9c7f0ab2':
  Remove libunwind-ptrace dependency.