Update some tests

Author: meg-gupta

test/Parse/explicit_lifetime_dependence_specifiers.swift

@@ -24,16 +24,16 @@ struct BufferView : ~Escapable {
     self.ptr = ptr
     return self
   }
-  init(_ ptr: UnsafeRawBufferPointer, _ a: consuming Wrapper, b: borrowing Array<Int>) -> dependsOn(a) dependsOn(b) Self {
+  init(_ ptr: UnsafeRawBufferPointer, _ a: consuming Wrapper, b: borrowing Array<Int>) -> dependsOn(a) dependsOn(scoped b) Self {
     self.ptr = ptr
     return self
   }
-  init(_ ptr: UnsafeRawBufferPointer, _ a: borrowing Array<Double>, b: borrowing Array<Int>, c: Double) -> dependsOn(a) dependsOn(b) Int { // expected-error{{expected Self return type for initializers with lifetime dependence specifiers}}
+  init(_ ptr: UnsafeRawBufferPointer, _ a: borrowing Array<Double>, b: borrowing Array<Int>, c: Double) -> dependsOn(scoped a) dependsOn(b) Int { // expected-error{{expected Self return type for initializers with lifetime dependence specifiers}}
     self.ptr = ptr
     return 0
   }
-  /* TODO: Enable this test once stdlib builds with NonescapableTypes support
-  init?(_ ptr: UnsafeRawBufferPointer, _ a: borrowing Array<Int>, _ i: Int) -> dependsOn(a) Self {
+  /* TODO: Enable this test once Optional is ~Escapable
+  init?(_ ptr: UnsafeRawBufferPointer, _ a: borrowing Array<Int>, _ i: Int) -> dependsOn(a) Self? {
     if (i % 2 == 0) {
       self.ptr = ptr
       return self