am 7d196df6: Merge "Move some tests to libc++."

* commit '7d196df6f9990b5c93e0661fb0867971da7e6c34':
  Move some tests to libc++.