diff --git a/src/test/java/com/google/android/libraries/feed/api/client/knowncontent/BUILD b/src/test/java/com/google/android/libraries/feed/api/client/knowncontent/BUILD
index 920d22c..9848c43 100644
--- a/src/test/java/com/google/android/libraries/feed/api/client/knowncontent/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/client/knowncontent/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ContentMetadataTest.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/api/client/scope/BUILD b/src/test/java/com/google/android/libraries/feed/api/client/scope/BUILD
index 367df83..6fef0ec 100644
--- a/src/test/java/com/google/android/libraries/feed/api/client/scope/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/client/scope/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ProcessScopeBuilderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/scope:processscope",
@@ -35,7 +34,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StreamScopeBuilderTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/scope:streamscope",
diff --git a/src/test/java/com/google/android/libraries/feed/api/host/config/BUILD b/src/test/java/com/google/android/libraries/feed/api/host/config/BUILD
index 4008191..4e5f0bf 100644
--- a/src/test/java/com/google/android/libraries/feed/api/host/config/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/host/config/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ConfigurationTest.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/api/host/storage/BUILD b/src/test/java/com/google/android/libraries/feed/api/host/storage/BUILD
index 64409a0..f0bc7cf 100644
--- a/src/test/java/com/google/android/libraries/feed/api/host/storage/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/host/storage/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["CommitResultTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/storage",
diff --git a/src/test/java/com/google/android/libraries/feed/api/internal/scope/BUILD b/src/test/java/com/google/android/libraries/feed/api/internal/scope/BUILD
index 660d862..9202285 100644
--- a/src/test/java/com/google/android/libraries/feed/api/internal/scope/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/api/internal/scope/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ClearAllListenerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/logging",
@@ -31,7 +30,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedProcessScopeTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/lifecycle",
diff --git a/src/test/java/com/google/android/libraries/feed/basicstream/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/BUILD
index 37e15f1..4da6cee 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["BasicStreamTest.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/drivers/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD
index 4eee8c3..8196380 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/drivers/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["CardDriverTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/stream",
@@ -45,7 +44,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ClusterDriverTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/stream",
@@ -82,7 +80,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ContentDriverTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/knowncontent",
@@ -128,7 +125,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ContinuationDriverTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -157,7 +153,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["HeaderDriverTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/stream",
@@ -176,7 +171,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["NoContentDriverTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/basicstream/internal/drivers",
@@ -194,7 +188,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StreamDriverTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/stream",
@@ -240,7 +233,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ZeroStateDriverTest.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/scroll/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/scroll/BUILD
index 15f80b9..43365ba 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/scroll/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/scroll/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["BasicStreamScrollMonitorTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/basicstream/internal/scroll",
@@ -27,7 +26,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["BasicStreamScrollTrackerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/logging",
@@ -48,7 +46,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ScrollRestorerTest.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/basicstream/internal/viewloggingupdater/BUILD b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewloggingupdater/BUILD
index dfff6cf..c04f2e8 100644
--- a/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewloggingupdater/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/basicstream/internal/viewloggingupdater/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ResettableOneShotVisibilityLoggingListenerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/basicstream/internal/viewloggingupdater",
@@ -24,7 +23,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ViewLoggingUpdaterTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/basicstream/internal/viewloggingupdater",
diff --git a/src/test/java/com/google/android/libraries/feed/common/feedobservable/BUILD b/src/test/java/com/google/android/libraries/feed/common/feedobservable/BUILD
index 99ce59d..bfc0f93 100644
--- a/src/test/java/com/google/android/libraries/feed/common/feedobservable/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/feedobservable/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedObservableTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/feedobservable",
diff --git a/src/test/java/com/google/android/libraries/feed/common/locale/BUILD b/src/test/java/com/google/android/libraries/feed/common/locale/BUILD
index 912aab0..33ce9af 100644
--- a/src/test/java/com/google/android/libraries/feed/common/locale/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/locale/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["LocaleUtilsTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/locale",
diff --git a/src/test/java/com/google/android/libraries/feed/common/logging/BUILD b/src/test/java/com/google/android/libraries/feed/common/logging/BUILD
index 3ef3f32..430dd18 100644
--- a/src/test/java/com/google/android/libraries/feed/common/logging/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/common/logging/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["DumperTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/logging",
@@ -24,7 +23,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["LoggerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/common/logging",
diff --git a/src/test/java/com/google/android/libraries/feed/feedactionmanager/BUILD b/src/test/java/com/google/android/libraries/feed/feedactionmanager/BUILD
index dcb9442..f6bc456 100644
--- a/src/test/java/com/google/android/libraries/feed/feedactionmanager/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedactionmanager/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedActionManagerImplTest.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/feedmodelprovider/BUILD b/src/test/java/com/google/android/libraries/feed/feedmodelprovider/BUILD
index a1e4eeb..0c6ce9c 100644
--- a/src/test/java/com/google/android/libraries/feed/feedmodelprovider/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedmodelprovider/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedModelProviderFactoryTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -32,7 +31,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedModelProviderTest.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/feedprotocoladapter/BUILD b/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/BUILD
index 26501cc..d8143dd 100644
--- a/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedProtocolAdapterTest.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/feedprotocoladapter/internal/transformers/BUILD b/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/internal/transformers/BUILD
index 0e07000..01e7fb9 100644
--- a/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/internal/transformers/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedprotocoladapter/internal/transformers/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ContentDataOperationTransformerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/feedprotocoladapter/internal/transformers",
@@ -26,7 +25,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeatureDataOperationTransformerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/feedprotocoladapter/internal/transformers",
diff --git a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/internal/BUILD b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/internal/BUILD
index cac8d60..e11db5b 100644
--- a/src/test/java/com/google/android/libraries/feed/feedrequestmanager/internal/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedrequestmanager/internal/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["UtilsTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/feedrequestmanager/internal",
diff --git a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/BUILD b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/BUILD
index 21f80a2..203c538 100644
--- a/src/test/java/com/google/android/libraries/feed/feedsessionmanager/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedsessionmanager/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedSessionManagerImplTest.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/feedstore/BUILD b/src/test/java/com/google/android/libraries/feed/feedstore/BUILD
index 34a2785..9eadb24 100644
--- a/src/test/java/com/google/android/libraries/feed/feedstore/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/feedstore/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedStoreEphemeralModeTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/config",
@@ -32,7 +31,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FeedStoreTest.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/hostimpl/network/BUILD b/src/test/java/com/google/android/libraries/feed/hostimpl/network/BUILD
index c7ecf83..dc186fe 100644
--- a/src/test/java/com/google/android/libraries/feed/hostimpl/network/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/hostimpl/network/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["NetworkClientWrapperTest.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/infraintegration/BUILD b/src/test/java/com/google/android/libraries/feed/infraintegration/BUILD
index ad9229d..63f36c8 100644
--- a/src/test/java/com/google/android/libraries/feed/infraintegration/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/infraintegration/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ClearAllTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/lifecycle",
@@ -31,7 +30,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ClientRequestManagerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -50,7 +48,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ContentRemoveTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -75,7 +72,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ContentUpdateTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -101,7 +97,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["DetachSessionTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -124,7 +119,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["EmptyStreamTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -148,7 +142,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ExistingSessionTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/common",
@@ -169,7 +162,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["FilterHeadTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -193,7 +185,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["GcTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/common",
@@ -218,7 +209,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["LimitedPagingTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -240,7 +230,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["MultiSessionPagingTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -266,7 +255,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["NoRequestWithContentTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/scheduler",
@@ -284,7 +272,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["NoRequestWithTimeoutTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/scheduler",
@@ -302,7 +289,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["NoRequestWithWaitTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/scheduler",
@@ -320,7 +306,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["RequestWithContentTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/scheduler",
@@ -338,7 +323,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["RequestWithTimeoutTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/scheduler",
@@ -356,7 +340,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["RequestWithWaitTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/scheduler",
@@ -374,7 +357,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["RemoveTrackingBehaviorTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -403,7 +385,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["RootOnlyTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -429,7 +410,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["SemanticPropertiesTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -452,7 +432,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["SharedStateTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -474,7 +453,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["SimpleStreamTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -497,7 +475,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StreamPagingTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -520,7 +497,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StructureUpdateTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
@@ -546,7 +522,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["SyntheticTokensTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/common",
@@ -578,7 +553,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["TimeoutSessionBaseTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/scheduler",
@@ -605,7 +579,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["TimeoutSessionWithContentTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/scheduler",
@@ -631,7 +604,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["ViewDepthProviderTests.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/client/requestmanager",
diff --git a/src/test/java/com/google/android/libraries/feed/piet/host/BUILD b/src/test/java/com/google/android/libraries/feed/piet/host/BUILD
index 3d32045..fe39848 100644
--- a/src/test/java/com/google/android/libraries/feed/piet/host/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/piet/host/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["AssetProviderTest.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/contentchanged/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/contentchanged/BUILD
index 00227fe..2d8fb3f 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/contentchanged/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/contentchanged/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["StreamContentChangedListenerTest.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/sharedstream/logging/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/logging/BUILD
index 4065671..3de348e 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/logging/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/logging/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["OneShotVisibilityLoggingListenerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/sharedstream/logging",
@@ -23,7 +22,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["SpinnerLoggerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/logging",
@@ -43,7 +41,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["UiSessionRequestLoggerTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/api/host/logging",
@@ -64,7 +61,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["VisibilityMonitorTest.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/sharedstream/ui/BUILD b/src/test/java/com/google/android/libraries/feed/sharedstream/ui/BUILD
index 3e5ad4e..2b31d61 100644
--- a/src/test/java/com/google/android/libraries/feed/sharedstream/ui/BUILD
+++ b/src/test/java/com/google/android/libraries/feed/sharedstream/ui/BUILD
@@ -7,7 +7,6 @@
     size = "small",
     timeout = "moderate",
     srcs = ["MaterialSpinnerViewTest.java"],
-    aapt_version = "aapt2",
     manifest_values = DEFAULT_ANDROID_LOCAL_TEST_MANIFEST,
     deps = [
         "//src/main/java/com/google/android/libraries/feed/sharedstream/ui",