Merge changes I5b8522aa,I541aea75

am: cdec7e7ee1

Change-Id: Ib68f185498f593f0812f481b2c82753cd5956fa5

cmd/dep_fixer/main.go

@@ -29,7 +29,7 @@ import (
 
 func main() {
 	flag.Usage = func() {
-		fmt.Fprintf(os.Stderr, "Usage: %s <depfile.d>")
+		fmt.Fprintf(os.Stderr, "Usage: %s <depfile.d>", os.Args[0])
 		flag.PrintDefaults()
 	}
 	output := flag.String("o", "", "Optional output file (defaults to rewriting source if necessary)")

cmd/path_interposer/main_test.go

@@ -183,7 +183,7 @@ func TestMissingPath(t *testing.T) {
 	interposer := setup(t)
 	err := os.Remove(interposer + "_origpath")
 	if err != nil {
-		t.Fatalf("Failed to remove:", err)
+		t.Fatal("Failed to remove:", err)
 	}
 
 	exitCode, err := Main(ioutil.Discard, ioutil.Discard, interposer, []string{"true"}, mainOpts{})

cmd/pom2bp/pom2bp.go

@@ -524,7 +524,7 @@ Usage: %s [--rewrite <regex>=<replace>] [-exclude <module>] [--extra-deps <modul
 		if pom.IsAar() {
 			err := pom.ExtractMinSdkVersion()
 			if err != nil {
-				fmt.Fprintln(os.Stderr, "Error reading manifest for %s: %s", pom.ArtifactFile, err)
+				fmt.Fprintf(os.Stderr, "Error reading manifest for %s: %s", pom.ArtifactFile, err)
 				os.Exit(1)
 			}
 		}

java/java.go

@@ -1034,7 +1034,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
 			// TODO(pszczepaniak): Support kotlin-reflect
 			stripFiles = append(stripFiles,
 				"**/*.kotlin_module",
-				"**/*.kotlin_builtin")
+				"**/*.kotlin_builtins")
 		} else {
 			// Only add kotlin-stdlib if not using (on-device) renamed stdlib
 			// (it's expected to be on device bootclasspath)