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

* commit '498c8135b46b976806fb4e335071c11fc2c51776':
  Move some tests to libc++.