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

Change-Id: I6df5fa2000910831b310b9412067b52833fc0401