diff --git a/ash/wm/ash_native_cursor_manager.cc b/ash/wm/ash_native_cursor_manager.cc
index ae7bcd4e60350..7f48cad7b760d 100644
--- a/ash/wm/ash_native_cursor_manager.cc
+++ b/ash/wm/ash_native_cursor_manager.cc
@@ -103,7 +103,9 @@ void AshNativeCursorManager::SetCursor(
     gfx::NativeCursor invisible_cursor(ui::kCursorNone);
     image_cursors_->SetPlatformCursor(&invisible_cursor);
     if (cursor == ui::kCursorCustom) {
-      cursor = invisible_cursor;
+      // Fall back to the default pointer cursor for now. (crbug.com/476078)
+      // TODO(oshima): support custom cursor.
+      cursor = ui::kCursorPointer;
     } else {
       cursor.SetPlatformCursor(invisible_cursor.platform());
     }
diff --git a/third_party/libc++/trunk b/third_party/libc++/trunk
new file mode 160000
index 0000000000000..48198f9110397
--- /dev/null
+++ b/third_party/libc++/trunk
@@ -0,0 +1 @@
+Subproject commit 48198f9110397fff47fe7c37cbfa296be7d44d3d
diff --git a/third_party/libc++abi/trunk b/third_party/libc++abi/trunk
new file mode 160000
index 0000000000000..4ad1009ab3a59
--- /dev/null
+++ b/third_party/libc++abi/trunk
@@ -0,0 +1 @@
+Subproject commit 4ad1009ab3a59fa7a6896d74d5e4de5885697f95