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

Change-Id: I628ead418977e651b672dd21a27bdb36e84b58d6