Merge changes I056c49e6,I994402cb

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

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),
 	}