Merge "Remove demangle, everyone use libc++ demangle."
am: b3fc1b7441

Change-Id: I646c14136a4fd9346333be77a4ab12abe37676ed