Merge "Make demangle work more like c++filt." am: 58c1804653 am: 939cb2950f am: 095164e1d1
am: b17a20b127

Change-Id: I9c1f473eeb82f2dd2a93ac119f77bcbfaeba0c29