Merge "Revert "Move some tests to libc++.""