Merge "Make demangle work more like c++filt."
am: 58c1804653

Change-Id: I9a1ae42f7808b63a6b3e3fa204b8e60d57920c93