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

This reverts commit 1d4a1edbc7.

Change-Id: I2909937fe582f2c5552bc86e7f4d2d5cff0de0aa

test/std/re/re.regex/re.regex.construct/awk_oct.pass.cpp

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

test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+// XFAIL: libcpp-no-exceptions
 // <regex>
 
 // template <class charT, class traits = regex_traits<charT>> class basic_regex;
@@ -16,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 static bool error_escape_thrown(const char *pat) 
 {
@@ -32,6 +34,7 @@ int main()
 {
     assert(error_escape_thrown("[\\a]"));
     assert(error_escape_thrown("\\a"));
+    assert(error_escape_thrown("\\"));
 
     assert(error_escape_thrown("[\\e]"));
     assert(error_escape_thrown("\\e"));

test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+// XFAIL: libcpp-no-exceptions
 // <regex>
 
 // template <class charT, class traits = regex_traits<charT>> class basic_regex;
@@ -16,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 static bool error_badrepeat_thrown(const char *pat) 
 {

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

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

test/std/re/re.regex/re.regex.construct/default.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.regex/re.regex.construct/il_flg.pass.cpp

@@ -16,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 #ifndef _LIBCPP_HAS_NO_GENERALIZED_INITIALIZERS
 

test/std/re/re.regex/re.regex.construct/iter_iter.pass.cpp

@@ -18,6 +18,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
+#include "test_macros.h"
 
 template <class Iter>
 void

test/std/re/re.regex/re.regex.construct/iter_iter_flg.pass.cpp

@@ -19,6 +19,7 @@
 #include <cassert>
 
 #include "test_iterators.h"
+#include "test_macros.h"
 
 template <class Iter>
 void

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

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.regex/re.regex.construct/ptr_flg.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class CharT>
 void

test/std/re/re.regex/re.regex.construct/ptr_size_flg.pass.cpp

@@ -15,6 +15,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class CharT>
 void

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

@@ -16,6 +16,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class String>
 void

test/std/re/re.regex/re.regex.construct/string_flg.pass.cpp

@@ -17,6 +17,7 @@
 
 #include <regex>
 #include <cassert>
+#include "test_macros.h"
 
 template <class String>
 void