Merge pull request swiftlang#40051 from mikeash/fix-kvokeypaths-test-back-deployment

[Test] Make KVOKeyPaths.swift work with un-nested Optionals.

Author: mikeash

test/stdlib/KVOKeyPaths.swift

@@ -215,6 +215,6 @@ testObjectForOptionalKeyPath.optionalObject = nil
 testObjectForOptionalKeyPath.optionalObject = "foo"
 
 // CHECK-51-LABEL: observe keyPath with optional value
-// CHECK-51-NEXT: oldValue = Optional(nil), newValue = Optional(nil)
-// CHECK-51-NEXT: oldValue = Optional(nil), newValue = Optional(nil)
+// CHECK-51-NEXT: oldValue = Optional(nil), newValue = {{Optional\(nil\)|nil}}
+// CHECK-51-NEXT: oldValue = Optional(nil), newValue = {{Optional\(nil\)|nil}}
 // CHECK-51-NEXT: oldValue = Optional(nil), newValue = Optional(Optional("foo"))