update master-with-bazel from master branch

src/crypto/bio/bio_test.cc

@@ -633,8 +633,11 @@ TEST(BIOTest, Gets) {
       check_bio_gets(bio.get());
     }
 
-    using ScopedFILE = std::unique_ptr<FILE, decltype(&fclose)>;
-    ScopedFILE file(tmpfile(), fclose);
+    struct FileCloser {
+      void operator()(FILE *f) const { fclose(f); }
+    };
+    using ScopedFILE = std::unique_ptr<FILE, FileCloser>;
+    ScopedFILE file(tmpfile());
 #if defined(OPENSSL_ANDROID)
     // On Android, when running from an APK, |tmpfile| does not work. See
     // b/36991167#comment8.