Merge "Move to the libc++ demangler." am: 8b6d5d4ff7 am: e9205f656d
am: 1a47d35918

Change-Id: I22b0af845a7759fd0507e7bc44e205f19c218ed0