am 7b63760e: Revert "Fix name of cxa_demangle"

* commit '7b63760eb6741acb1a7961eed739f52599075cd7':
  Revert "Fix name of cxa_demangle"