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

Change-Id: I489539756be314f780fd3b69cf7dfe97ffb7e47a