Internal change

PiperOrigin-RevId: 261835299
Change-Id: Ie16dbd5f5f9cd22c1bd389d1938250e9023ec652
diff --git a/src/test/java/com/google/android/libraries/feed/api/common/BUILD b/src/test/java/com/google/android/libraries/feed/api/common/BUILD
index a46769e..a5c642c 100644
--- a/src/test/java/com/google/android/libraries/feed/api/common/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/common/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["MutationContextTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/common",
diff --git a/src/test/java/com/google/android/libraries/feed/api/internal/common/BUILD b/src/test/java/com/google/android/libraries/feed/api/internal/common/BUILD
index bc805d4..212e36e 100644
--- a/src/test/java/com/google/android/libraries/feed/api/internal/common/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/internal/common/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ThreadUtilsTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/common",
diff --git a/src/test/java/com/google/android/libraries/feed/common/ui/BUILD b/src/test/java/com/google/android/libraries/feed/common/ui/BUILD
index d42fff0..d298fb8 100644
--- a/src/test/java/com/google/android/libraries/feed/common/ui/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/ui/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["LayoutUtilsTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/ui",
diff --git a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/BUILD b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/BUILD
index b289e18..9789d80 100644
--- a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/internal/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ContentCacheTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/common/testing",
@@ -26,7 +25,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["HeadSessionImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/common",
@@ -51,7 +49,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["HeadAsStructureTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/common/testing",
@@ -76,7 +73,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["SessionManagerMutationTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/knowncontent",
@@ -110,7 +106,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["SessionCacheTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -138,7 +133,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["SessionImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/common",
@@ -164,7 +158,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["SessionContentTrackerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/common/testing",
@@ -182,7 +175,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["TimeoutSessionImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/common",
diff --git a/src/test/java/com/google/android/libraries/feed/piet/ui/BUILD b/src/test/java/com/google/android/libraries/feed/piet/ui/BUILD
index de5e954..8f55049 100644
--- a/src/test/java/com/google/android/libraries/feed/piet/ui/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/piet/ui/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["AspectRatioScalingImageViewTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/piet/ui",
@@ -23,7 +22,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["BitmapMaskingRoundedCornerDelegateTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/functional",
@@ -41,7 +39,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["BorderDrawableTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/ui",
@@ -59,7 +56,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["GradientDrawableTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/functional",
@@ -77,7 +73,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["GradientShaderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/functional",
@@ -95,7 +90,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["GridRowViewTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/functional",
@@ -113,7 +107,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["RoundedCornerViewHelperTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/piet/ui",
@@ -130,7 +123,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["RoundedCornerMaskCacheTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/testing",
@@ -147,7 +139,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["RoundedCornerWrapperViewTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/functional",
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer/BUILD
index a219d85..66cab73 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["MenuMeasurerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/sharedstream/publicapi/menumeasurer",
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/removetrackingfactory/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/removetrackingfactory/BUILD
index 24187f1..d18aa76 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/removetrackingfactory/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/removetrackingfactory/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StreamRemoveTrackingFactoryTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/knowncontent",