Snap for 8580505 from cdbab1ea51f8cf52dba7e54502a86678a3151deb to main-cg-testing-release

Change-Id: Iec1c3d5ab27073ff6299a7cda78c435040ee1d1b
diff --git a/bpmodify/bpmodify.go b/bpmodify/bpmodify.go
index 431eb83..aecda73 100644
--- a/bpmodify/bpmodify.go
+++ b/bpmodify/bpmodify.go
@@ -15,6 +15,7 @@
 	"os/exec"
 	"path/filepath"
 	"strings"
+	"syscall"
 	"unicode"
 
 	"github.com/google/blueprint/parser"
@@ -68,6 +69,11 @@
 			return err
 		}
 		defer f.Close()
+
+		if *write {
+			syscall.Flock(int(f.Fd()), syscall.LOCK_EX)
+		}
+
 		in = f
 	}