Merge "Make demangle work more like c++filt."