am e7af79d8: Merge "Revert "Switch to libc++""

* commit 'e7af79d89d5c5d3dd7753e9421e11ea6fe7cb19f':
  Revert "Switch to libc++"