Revert "Revert "Update aosp/master libcxx rebase to r263688""

This reverts commit 1d4a1edbc7.

Change-Id: I2909937fe582f2c5552bc86e7f4d2d5cff0de0aa

test/std/re/re.regex/re.regex.assign/assign.il.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/assign.pass.cpp

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+// XFAIL: libcpp-no-exceptions
 // <regex>
 
 // template <class charT, class traits = regex_traits<charT>> class basic_regex;
@@ -15,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/assign_iter_iter_flag.pass.cpp

@@ -19,6 +19,7 @@
 #include <regex>
 #include <cassert>
 
+#include "test_macros.h"
 #include "test_iterators.h"
 
 int main()

test/std/re/re.regex/re.regex.assign/assign_ptr_flag.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/assign_ptr_size_flag.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/assign_string_flag.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/copy.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/il.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/ptr.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {

test/std/re/re.regex/re.regex.assign/string.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 int main()
 {