Internal change

PiperOrigin-RevId: 261833239
Change-Id: I250c07207702a4448c64fb77df34d9e4217426f4
diff --git a/src/test/java/com/google/android/libraries/feed/api/host/network/BUILD b/src/test/java/com/google/android/libraries/feed/api/host/network/BUILD
index 8b31ac9..2b1efb6 100644
--- a/src/test/java/com/google/android/libraries/feed/api/host/network/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/host/network/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["HttpRequestTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/network",
@@ -24,7 +23,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["HttpHeaderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/network",
diff --git a/src/test/java/com/google/android/libraries/feed/api/internal/modelprovider/BUILD b/src/test/java/com/google/android/libraries/feed/api/internal/modelprovider/BUILD
index b84293e..bfba084 100644
--- a/src/test/java/com/google/android/libraries/feed/api/internal/modelprovider/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/internal/modelprovider/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["RemoveTrackingTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/common",
@@ -28,7 +27,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["TokenCompletedTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/modelprovider",
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/BUILD
index 864014f..0642c55 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StreamItemAnimatorTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/stream",
@@ -26,7 +25,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StreamItemTouchCallbacksTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/basicstream/internal",
@@ -45,7 +43,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StreamRecyclerViewAdapterTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/stream",
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD
index b2cd092..33fe4e0 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/actions/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StreamActionApiImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/knowncontent",
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD
index 7fcaffb..d912aec 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewholders/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ContinuationViewHolderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -28,7 +27,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["HeaderViewHolderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/stream",
@@ -46,7 +44,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["NoContentViewHolderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/stream",
@@ -64,7 +61,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["PietViewHolderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -100,7 +96,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ZeroStateViewHolderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/stream",
diff --git a/src/test/java/com/google/android/libraries/feed/common/BUILD b/src/test/java/com/google/android/libraries/feed/common/BUILD
index 67f1411..4b345e2 100644
--- a/src/test/java/com/google/android/libraries/feed/common/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ValidatorsTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common",
@@ -24,7 +23,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ResultTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common",
diff --git a/src/test/java/com/google/android/libraries/feed/common/concurrent/BUILD b/src/test/java/com/google/android/libraries/feed/common/concurrent/BUILD
index cec44e4..e44d939 100644
--- a/src/test/java/com/google/android/libraries/feed/common/concurrent/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/concurrent/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["CancelableRunnableTaskTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/concurrent",
@@ -23,7 +22,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["SimpleSettableFutureTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/concurrent",
@@ -40,7 +38,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["TaskQueueTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/logging",
diff --git a/src/test/java/com/google/android/libraries/feed/common/intern/BUILD b/src/test/java/com/google/android/libraries/feed/common/intern/BUILD
index 1189f51..06cd746 100644
--- a/src/test/java/com/google/android/libraries/feed/common/intern/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/intern/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["HashPoolInternerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/intern",
@@ -24,7 +23,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["InternedMapTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/intern",
@@ -41,7 +39,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["InternerWithStatsTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/intern",
@@ -58,7 +55,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["WeakPoolInternerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/intern",
diff --git a/src/test/java/com/google/android/libraries/feed/feedactionparser/BUILD b/src/test/java/com/google/android/libraries/feed/feedactionparser/BUILD
index ce042fe..f457ca6 100644
--- a/src/test/java/com/google/android/libraries/feed/feedactionparser/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedactionparser/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedActionParserTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/knowncontent",
diff --git a/src/test/java/com/google/android/libraries/feed/feedactionreader/BUILD b/src/test/java/com/google/android/libraries/feed/feedactionreader/BUILD
index 8dec816..d8fa3dc 100644
--- a/src/test/java/com/google/android/libraries/feed/feedactionreader/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedactionreader/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedActionReaderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
diff --git a/src/test/java/com/google/android/libraries/feed/feedapplifecyclelistener/BUILD b/src/test/java/com/google/android/libraries/feed/feedapplifecyclelistener/BUILD
index 50fa7fd..863a3ed 100644
--- a/src/test/java/com/google/android/libraries/feed/feedapplifecyclelistener/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedapplifecyclelistener/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedAppLifecycleListenerTest.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/feedknowncontent/BUILD b/src/test/java/com/google/android/libraries/feed/feedknowncontent/BUILD
index 847f307..aa0f6f8 100644
--- a/src/test/java/com/google/android/libraries/feed/feedknowncontent/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedknowncontent/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedKnownContentImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/knowncontent",
diff --git a/src/test/java/com/google/android/libraries/feed/feedmodelprovider/internal/BUILD b/src/test/java/com/google/android/libraries/feed/feedmodelprovider/internal/BUILD
index bbe4603..0490c1b 100644
--- a/src/test/java/com/google/android/libraries/feed/feedmodelprovider/internal/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedmodelprovider/internal/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeatureChangeImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/common/testing",
@@ -27,7 +26,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ModelCursorImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/common/testing",
@@ -46,7 +44,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ModelFeatureImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/modelprovider",
@@ -65,7 +62,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ModelMutationImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/common",
@@ -85,7 +81,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ModelTokenImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/modelprovider",
diff --git a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/BUILD b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/BUILD
index 6eb3e31..e4a7aa4 100644
--- a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedActionUploadRequestManagerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -36,7 +35,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["RequestManagerImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/common",
@@ -59,7 +57,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedRequestManagerImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -98,7 +95,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["UploadableActionsRequestBuilderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/feedrequestmanager",
diff --git a/src/test/java/com/google/android/libraries/feed/feedstore/internal/BUILD b/src/test/java/com/google/android/libraries/feed/feedstore/internal/BUILD
index b428e85..9b71a53 100644
--- a/src/test/java/com/google/android/libraries/feed/feedstore/internal/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedstore/internal/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["LocalActionGcTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/storage",
@@ -28,7 +27,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ContentGcTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/storage",
@@ -51,7 +49,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["EphemeralFeedStoreTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/store",
@@ -70,7 +67,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["PersistentFeedStoreTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/logging",
@@ -100,7 +96,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StreamPayloadInternerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/intern",
@@ -118,7 +113,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StreamStructureInternerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/intern",
diff --git a/src/test/java/com/google/android/libraries/feed/hostimpl/scheduler/BUILD b/src/test/java/com/google/android/libraries/feed/hostimpl/scheduler/BUILD
index b9aaed3..db34fa3 100644
--- a/src/test/java/com/google/android/libraries/feed/hostimpl/scheduler/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/hostimpl/scheduler/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["SchedulerApiWrapperTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/scheduler",
diff --git a/src/test/java/com/google/android/libraries/feed/hostimpl/storage/BUILD b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/BUILD
index c19daa5..c319726 100644
--- a/src/test/java/com/google/android/libraries/feed/hostimpl/storage/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["PersistentContentStorageTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/common",
@@ -27,7 +26,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["PersistentContentStorageDirectTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/common",
@@ -47,7 +45,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["PersistentJournalStorageTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/internal/common",
@@ -68,7 +65,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["PersistentJournalStorageDirectTest.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/hostimpl/storage/testing/BUILD b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/testing/BUILD
index 438aedb..31e2125 100644
--- a/src/test/java/com/google/android/libraries/feed/hostimpl/storage/testing/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/hostimpl/storage/testing/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["InMemoryJournalStorageTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/feedstore/testing",
@@ -25,7 +24,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["InMemoryJournalStorageDirectTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/hostimpl/storage/testing",
@@ -41,7 +39,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["InMemoryContentStorageTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/feedstore/testing",
@@ -58,7 +55,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["InMemoryContentStorageDirectTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/hostimpl/storage/testing",
diff --git a/src/test/java/com/google/android/libraries/feed/mocknetworkclient/BUILD b/src/test/java/com/google/android/libraries/feed/mocknetworkclient/BUILD
index ea00977..5219a29 100644
--- a/src/test/java/com/google/android/libraries/feed/mocknetworkclient/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/mocknetworkclient/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["MockServerNetworkClientTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
diff --git a/src/test/java/com/google/android/libraries/feed/piet/BUILD b/src/test/java/com/google/android/libraries/feed/piet/BUILD
index f8d2542..27ead38 100644
--- a/src/test/java/com/google/android/libraries/feed/piet/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/piet/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ChunkedTextElementAdapterTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/imageloader",
@@ -31,7 +30,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["CustomElementAdapterTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/functional",
@@ -53,7 +51,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["DebugLoggerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/ui",
@@ -72,7 +69,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ElementAdapterFactoryTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/testing",
@@ -91,7 +87,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ElementAdapterTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/functional",
@@ -115,7 +110,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ElementContainerAdapterTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/functional",
@@ -137,7 +131,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ElementListAdapterTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/functional",
@@ -160,7 +153,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ElementStackAdapterTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/functional",
@@ -181,7 +173,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FrameAdapterImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -205,7 +196,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FrameContextTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -228,7 +218,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["GridRowAdapterTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -254,7 +243,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ImageElementAdapterTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/imageloader",
@@ -281,7 +269,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["KeyedRecyclerPoolTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/testing",
@@ -301,7 +288,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["LoadImageCallbackTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/time/testing",
@@ -320,7 +306,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["MediaQueryHelperTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/testing",
@@ -353,7 +338,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ParameterizedTextElementAdapterFactoryTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/time/testing",
@@ -374,7 +358,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ParameterizedTextElementAdapterTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/testing",
@@ -397,7 +380,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ParameterizedTextEvaluatorTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/time/testing",
@@ -417,7 +399,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["PietManagerImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -442,7 +423,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["PietStylesHelperTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/testing",
@@ -463,7 +443,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["SingleKeyRecyclerPoolTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/testing",
@@ -482,7 +461,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StyleProviderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/functional",
@@ -504,7 +482,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["TemplateBinderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -527,7 +504,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["TextElementAdapterTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/functional",
@@ -552,7 +528,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ViewUtilsTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/piet",
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/BUILD
index 86a0212..44dd520 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/contextmenumanager/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ContextMenuManagerImplTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/sharedstream/contextmenumanager",
@@ -25,7 +24,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FloatingContextMenuManagerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/sharedstream/contextmenumanager",
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/deepestcontenttracker/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/deepestcontenttracker/BUILD
index 3098676..5d2a1c2 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/deepestcontenttracker/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/deepestcontenttracker/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["DeepestContentTrackerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/sharedstream/deepestcontenttracker",
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/BUILD
index 12ea8d6..c7c3fd3 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/offlinemonitor/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StreamOfflineMonitorTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/offlineindicator",
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/piet/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/piet/BUILD
index f62c4c9..b69fa49 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/piet/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/piet/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["PietEventLoggerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/logging",
@@ -25,7 +24,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["PietImageLoaderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/imageloader",
@@ -46,7 +44,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["PietHostBindingProviderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/piet/host",
@@ -67,7 +64,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["PietCustomElementProviderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/piet/host",
@@ -86,7 +82,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["PietRequiredContentAdapterTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/sharedstream/piet",
diff --git a/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/BUILD
index fa9cea6..aad383f 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/scroll/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ScrollListenerNotifierTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/stream",
@@ -29,7 +28,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ScrollLoggerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/logging",
@@ -46,7 +44,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ScrollRestoreHelperTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -66,7 +63,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ScrollTrackerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/concurrent/testing",