Merge "Remove unnecessary TestMain()"

apex/apex_test.go

@@ -16,7 +16,6 @@ package apex
 
 import (
 	"fmt"
-	"os"
 	"path"
 	"path/filepath"
 	"reflect"
@@ -9745,7 +9744,3 @@ func TestApexBuildsAgainstApiSurfaceStubLibraries(t *testing.T) {
 	libcCoreVariant := result.ModuleForTests("libc.apiimport", "android_arm64_armv8-a_shared").Module()
 	android.AssertBoolEquals(t, "core variant should link against source libc", true, hasDep(libfooCoreVariant, libcCoreVariant))
 }
-
-func TestMain(m *testing.M) {
-	os.Exit(m.Run())
-}