Merge "Move to the libc++ demangler."
am: 89bb586d52

Change-Id: I711860b8e024f0763be96e94740cb688132aa005