am 6e4438f5: Merge "Remove additional prefix for unwind symbols"

* commit '6e4438f58e57c3a83dc9b274e2059ca8e119bef1':
  Remove additional prefix for unwind symbols