Revert "Merge to upstream r304942."

This reverts commit 83b1388ecd, reversing
changes made to f20819f925.

Test: treehugger
Bug: None

test/std/algorithms/alg.modifying.operations/alg.unique/unique.pass.cpp

@@ -17,9 +17,10 @@
 
 #include <algorithm>
 #include <cassert>
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 #include <memory>
+#endif
 
-#include "test_macros.h"
 #include "test_iterators.h"
 
 template <class Iter>
@@ -83,7 +84,7 @@ test()
     assert(ii[2] == 2);
 }
 
-#if TEST_STD_VER >= 11
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
 struct do_nothing
 {
@@ -167,7 +168,8 @@ test1()
     assert(*ii[1] == 1);
     assert(*ii[2] == 2);
 }
-#endif // TEST_STD_VER >= 11
+
+#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 
 int main()
 {
@@ -176,10 +178,12 @@ int main()
     test<random_access_iterator<int*> >();
     test<int*>();
 
-#if TEST_STD_VER >= 11
+#ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES
+
     test1<forward_iterator<Ptr*> >();
     test1<bidirectional_iterator<Ptr*> >();
     test1<random_access_iterator<Ptr*> >();
     test1<Ptr*>();
-#endif
+
+#endif  // _LIBCPP_HAS_NO_RVALUE_REFERENCES
 }