Revert "Revert "Merge to upstream r304942.""

This reverts commit 38a0d5af7e.

Test: make checkbuild
Test: ./run_tests.py
Test: ./run_tests.py --bitness 64

test/std/numerics/rand/rand.eng/rand.eng.mers/values.pass.cpp

@@ -40,6 +40,8 @@
 #include <type_traits>
 #include <cassert>
 
+#include "test_macros.h"
+
 template <class _Tp>
 void where(const _Tp &) {}