am 06279285: Merge "Revert "Move some tests to libc++.""

* commit '06279285ae38b58988a9431c89b8689d8e16904e':
  Revert "Move some tests to libc++."