Merge pull request #11472 from moiseev/public-protocols-4

[swift-4.0-branch][overlay] Public extensions on external protocol are not in fact public
diff --git a/stdlib/public/SDK/AVFoundation/AVCaptureDevice.swift b/stdlib/public/SDK/AVFoundation/AVCaptureDevice.swift
index c531176..ebaad18 100644
--- a/stdlib/public/SDK/AVFoundation/AVCaptureDevice.swift
+++ b/stdlib/public/SDK/AVFoundation/AVCaptureDevice.swift
@@ -16,7 +16,7 @@
 
 #if os(iOS)
 
-internal protocol _AVCaptureDeviceFormatSupportedColorSpaces {
+public protocol _AVCaptureDeviceFormatSupportedColorSpaces {
   @available(iOS, introduced: 10.0)
   var __supportedColorSpaces: [NSNumber] { get }
 }
diff --git a/stdlib/public/SDK/AVFoundation/AVCapturePhotoOutput.swift b/stdlib/public/SDK/AVFoundation/AVCapturePhotoOutput.swift
index 705d949..d1f8c18 100644
--- a/stdlib/public/SDK/AVFoundation/AVCapturePhotoOutput.swift
+++ b/stdlib/public/SDK/AVFoundation/AVCapturePhotoOutput.swift
@@ -16,7 +16,7 @@
 
 #if os(iOS)
 
-internal protocol _AVCapturePhotoOutputSwiftNativeTypes {
+public protocol _AVCapturePhotoOutputSwiftNativeTypes {
   var __supportedFlashModes: [NSNumber] { get }
   var __availablePhotoPixelFormatTypes: [NSNumber] { get }
   var __availableRawPhotoPixelFormatTypes: [NSNumber] { get }
@@ -71,7 +71,7 @@
 }
 
 
-internal protocol _AVCapturePhotoSettingsSwiftNativeTypes {
+public protocol _AVCapturePhotoSettingsSwiftNativeTypes {
   var __availablePreviewPhotoPixelFormatTypes: [NSNumber] { get }
 }
 
diff --git a/stdlib/public/SDK/Intents/INRideOption.swift b/stdlib/public/SDK/Intents/INRideOption.swift
index 37d7ae7..c6b8959 100644
--- a/stdlib/public/SDK/Intents/INRideOption.swift
+++ b/stdlib/public/SDK/Intents/INRideOption.swift
@@ -19,7 +19,7 @@
 // <rdar://problem/29447066>
 // Compiler incorrectly handles combinations of availability declarations on
 // independent axes.
-internal protocol _INRideOptionMeteredFare {
+public protocol _INRideOptionMeteredFare {
   var __usesMeteredFare: NSNumber? { get set }
 }
 
diff --git a/test/stdlib/Intents.swift b/test/stdlib/Intents.swift
index e73b85e..de7a3fd 100644
--- a/test/stdlib/Intents.swift
+++ b/test/stdlib/Intents.swift
@@ -1,4 +1,4 @@
-// RUN: %target-run-simple-swift
+// RUN: rm -rf %t && mkdir %t
 // RUN: %target-build-swift %s -o %t/a.out3 -swift-version 3 && %target-run %t/a.out3
 // RUN: %target-build-swift %s -o %t/a.out4 -swift-version 4 && %target-run %t/a.out4
 // REQUIRES: executable_test