Merge changes I056c49e6,I994402cb

* changes:
  Fix OutputPath.InSameDir example
  Fix go vet error

android/bazel_handler.go

@@ -188,8 +188,8 @@ func (context *bazelContext) issueBazelCommand(command string, labels []string,
 	bazelCmd.Dir = context.workspaceDir
 	bazelCmd.Env = append(os.Environ(), "HOME="+context.homeDir, pwdPrefix())
 
-	var stderr bytes.Buffer
-	bazelCmd.Stderr = &stderr
+	stderr := &bytes.Buffer{}
+	bazelCmd.Stderr = stderr
 
 	if output, err := bazelCmd.Output(); err != nil {
 		return "", fmt.Errorf("bazel command failed. command: [%s], error [%s]", bazelCmd, stderr)

android/paths_test.go

@@ -1260,7 +1260,7 @@ func ExampleOutputPath_ReplaceExtension() {
 	// boot.art boot.oat
 }
 
-func ExampleOutputPath_FileInSameDir() {
+func ExampleOutputPath_InSameDir() {
 	ctx := &configErrorWrapper{
 		config: TestConfig("out", nil, "", nil),
 	}