Merge "Move testing.go to srcs from testSrcs." am: 2cc767d72c

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2183860

Change-Id: I9fa1b716f071eefa944b06a8045b6dac2ac2c1c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bp2build/Android.bp

@@ -15,6 +15,7 @@ bootstrap_go_package {
         "conversion.go",
         "metrics.go",
         "symlink_forest.go",
+        "testing.go",
     ],
     deps: [
         "soong-android",
@@ -68,7 +69,6 @@ bootstrap_go_package {
         "python_library_conversion_test.go",
         "sh_conversion_test.go",
         "soong_config_module_type_conversion_test.go",
-        "testing.go",
     ],
     pluginFor: [
         "soong_build",