Update regular expression to extract Swift version in source download…

… script, which didn't handle 5.10.1 properly

Also, remove patch that was upstreamed.

.github/workflows/sdks.yml

@@ -110,7 +110,7 @@ jobs:
           git apply swift-android-ci.patch
           git apply -C1 swift-android.patch swift-android-both-ndks.patch
           if [[ ${{ matrix.version }} = 'release'* ]]; then
-            git apply swift-android-tsc.patch swift-android-stdlib-except-trunk.patch
+            git apply swift-android-stdlib-except-trunk.patch
             STUPID_FILE_RENAMING=Tool
           else
             sed -i "s%r26%ndk/26%" swift/stdlib/cmake/modules/AddSwiftStdlib.cmake

get-packages-and-swift-source.swift

@@ -31,7 +31,7 @@ var sdkDir = "", icuVersion = "", icuMajorVersion = "", swiftVersion = "",
     swiftBranch = "", swiftSnapshotDate = ""
 
 let tagRange = NSRange(SWIFT_TAG.startIndex..., in: SWIFT_TAG)
-let tagExtract = try NSRegularExpression(pattern: "swift-([0-9]+\\.[0-9])?\\.?[0-9]*-?([A-Z-]+)([0-9-]+[0-9])?")
+let tagExtract = try NSRegularExpression(pattern: "swift-([5-9]\\.[0-9]+)?\\.?[1-9]*-?([A-Z-]+)([0-9-]+[0-9])?")
 
 if tagExtract.numberOfMatches(in: SWIFT_TAG, range: tagRange) == 1 {
   let match = tagExtract.firstMatch(in: SWIFT_TAG, range: tagRange)