Merge "Move to the libc++ demangler."
am: 19b24bada5

Change-Id: I1e4b8a5cba4e19c2d4795f20a4ac9c6da823642e