[master-next] More changes to adapt to new LLVM flags in r334221

My previous change for this issue (033b884de6) did not fix all the
affected code. This gets the rest of them. Thanks for Jason Molenda
for helping with this. rdar://problem/41025365

tools/swift-syntax-test/swift-syntax-test.cpp

@@ -456,7 +456,8 @@ void saveReuseLog(SourceManager &SourceMgr, unsigned BufferID,
                   SyntaxParsingCache *Cache) {
   std::error_code ErrorCode;
   llvm::raw_fd_ostream ReuseLog(options::IncrementalReuseLog, ErrorCode,
-                                llvm::sys::fs::OpenFlags::F_RW);
+                                llvm::sys::fs::FA_Read |
+                                    llvm::sys::fs::FA_Write);
   assert(!ErrorCode && "Unable to open incremental usage log");
 
   for (auto ReuseRange : Cache->getReusedRanges()) {