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

* commit '015b89cce2497f4157ac0322ebc4a604178a304a':
  Cleanup libc++ configuration.