Merge changes I92cea061,I67705c5c am: 1cdcf50b4b am: d2420c22d7

am: 8332e0e52d

* commit '8332e0e52d4c692c869df6121675b1c114e9d952':
  Add spaces around := when dumping assignments
  Fix govet issue

Change-Id: Id70fa92e755675de22cd3078992fb611c69a6def

androidmk/parser/ast.go

@@ -22,7 +22,7 @@ func (x *Assignment) Dump() string {
 	if x.Target != nil {
 		target = x.Target.Dump() + ": "
 	}
-	return target + x.Name.Dump() + x.Type + x.Value.Dump()
+	return target + x.Name.Dump() + " " + x.Type + " " + x.Value.Dump()
 }
 
 func (x *Assignment) Pos() Pos {

cmd/soong_glob/soong_glob.go

@@ -61,7 +61,7 @@ func main() {
 	flag.Parse()
 
 	if *out == "" {
-		fmt.Fprintln(os.Stderr, "error: -o is required\n")
+		fmt.Fprintf(os.Stderr, "error: -o is required\n")
 		usage()
 	}