diff --git a/extensions/cronet/src/androidTest/AndroidManifest.xml b/extensions/cronet/src/androidTest/AndroidManifest.xml
index 96e8e54f57..5ce815adae 100644
--- a/extensions/cronet/src/androidTest/AndroidManifest.xml
+++ b/extensions/cronet/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,7 @@
+ package="com.google.android.exoplayer2.ext.cronet.test">
@@ -28,7 +28,7 @@
tools:ignore="MissingApplicationIcon,HardcodedDebugMode"/>
diff --git a/extensions/cronet/src/test/AndroidManifest.xml b/extensions/cronet/src/test/AndroidManifest.xml
index d6e09107a7..ea3f510328 100644
--- a/extensions/cronet/src/test/AndroidManifest.xml
+++ b/extensions/cronet/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
limitations under the License.
-->
-
+
diff --git a/extensions/ffmpeg/src/test/AndroidManifest.xml b/extensions/ffmpeg/src/test/AndroidManifest.xml
index 6ec1cea289..cb214bc41a 100644
--- a/extensions/ffmpeg/src/test/AndroidManifest.xml
+++ b/extensions/ffmpeg/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
limitations under the License.
-->
-
+
diff --git a/extensions/flac/src/test/AndroidManifest.xml b/extensions/flac/src/test/AndroidManifest.xml
index 509151aa21..362e3986e3 100644
--- a/extensions/flac/src/test/AndroidManifest.xml
+++ b/extensions/flac/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
limitations under the License.
-->
-
+
diff --git a/extensions/opus/src/test/AndroidManifest.xml b/extensions/opus/src/test/AndroidManifest.xml
index d17f889d17..b015221785 100644
--- a/extensions/opus/src/test/AndroidManifest.xml
+++ b/extensions/opus/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
limitations under the License.
-->
-
+
diff --git a/extensions/rtmp/src/test/AndroidManifest.xml b/extensions/rtmp/src/test/AndroidManifest.xml
index b2e19827d9..ff41eda581 100644
--- a/extensions/rtmp/src/test/AndroidManifest.xml
+++ b/extensions/rtmp/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
limitations under the License.
-->
-
+
diff --git a/extensions/vp9/src/test/AndroidManifest.xml b/extensions/vp9/src/test/AndroidManifest.xml
index 851213e653..08c7e6b6ee 100644
--- a/extensions/vp9/src/test/AndroidManifest.xml
+++ b/extensions/vp9/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
limitations under the License.
-->
-
+
diff --git a/library/common/src/test/AndroidManifest.xml b/library/common/src/test/AndroidManifest.xml
index 46c19f53c9..a90b358a73 100644
--- a/library/common/src/test/AndroidManifest.xml
+++ b/library/common/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
limitations under the License.
-->
-
+
diff --git a/library/datasource/src/test/AndroidManifest.xml b/library/datasource/src/test/AndroidManifest.xml
index 173af4332e..869326cce0 100644
--- a/library/datasource/src/test/AndroidManifest.xml
+++ b/library/datasource/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
limitations under the License.
-->
-
+
diff --git a/library/decoder/src/test/AndroidManifest.xml b/library/decoder/src/test/AndroidManifest.xml
index 66cfd433a3..bcb61fbc63 100644
--- a/library/decoder/src/test/AndroidManifest.xml
+++ b/library/decoder/src/test/AndroidManifest.xml
@@ -14,6 +14,6 @@
limitations under the License.
-->
-
+
diff --git a/playbacktests/src/androidTest/AndroidManifest.xml b/playbacktests/src/androidTest/AndroidManifest.xml
index 2c2099496a..5f9b5429f9 100644
--- a/playbacktests/src/androidTest/AndroidManifest.xml
+++ b/playbacktests/src/androidTest/AndroidManifest.xml
@@ -16,7 +16,7 @@
+ package="com.google.android.exoplayer2.playbacktests.test">
@@ -32,7 +32,7 @@