Additional merge fixes

Author: rjmccall

stdlib/public/Concurrency/Task.swift

@@ -977,7 +977,7 @@ public func _runChildTask<T>(
 
   // Create the asynchronous task future.
   let (task, _) = Builtin.createAsyncTaskFuture(
-      flags.bits, operation)
+      Int(flags.bits), operation)
 
   // Enqueue the resulting job.
   _enqueueJobGlobal(Builtin.convertTaskToJob(task))

test/Concurrency/Runtime/custom_executors.swift

@@ -15,7 +15,7 @@ actor Simple {
 
 actor Custom {
   var count = 0
-  nonisolated let simple = Simple()
+  /*nonisolated*/ let simple = Simple()
 
   @available(macOS 9999, iOS 9999, watchOS 9999, tvOS 9999, *)
   nonisolated var unownedExecutor: UnownedSerialExecutor {