am 955ebbaa: Merge "Cleanup libc++ configuration."

* commit '955ebbaa952479f9c99391ee81c6b35d3db9b410':
  Cleanup libc++ configuration.