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

* commit '21d8d89c7cda35ad1571375cf051c0b050604619':
  Revert "Move some tests to libc++."