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

Change-Id: Ia0c2e1d35f48b6d2fa7b7414cf8ee928e7899a46