Merge "Allow overrides for RBE_log_dir"
diff --git a/ui/build/config.go b/ui/build/config.go
index 9bd0877..27f3be3 100644
--- a/ui/build/config.go
+++ b/ui/build/config.go
@@ -851,6 +851,11 @@
 }
 
 func (c *configImpl) logDir() string {
+	for _, f := range []string{"RBE_log_dir", "FLAG_log_dir"} {
+		if v, ok := c.environ.Get(f); ok {
+			return v
+		}
+	}
 	if c.Dist() {
 		return filepath.Join(c.DistDir(), "logs")
 	}