diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/package-info.java b/google3/third_party/java_src/android_libs/media/github/package-info-exoplayer-upstream-crypto.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/package-info.java
rename to google3/third_party/java_src/android_libs/media/github/package-info-exoplayer-upstream-crypto.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java
rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/DataSink.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java
similarity index 97%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java
rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java
index 4e5b9f2b8e..1966f76a83 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSink.java
@@ -19,8 +19,6 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
 import static java.lang.Math.min;
 
 import androidx.annotation.Nullable;
-import com.google.android.exoplayer2.upstream.DataSink;
-import com.google.android.exoplayer2.upstream.DataSpec;
 import java.io.IOException;
 import javax.crypto.Cipher;
 
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java
similarity index 93%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java
rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java
index 98ec914fa0..633b54fb20 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesCipherDataSource.java
@@ -21,9 +21,6 @@ import static com.google.android.exoplayer2.util.Util.castNonNull;
 import android.net.Uri;
 import androidx.annotation.Nullable;
 import com.google.android.exoplayer2.C;
-import com.google.android.exoplayer2.upstream.DataSource;
-import com.google.android.exoplayer2.upstream.DataSpec;
-import com.google.android.exoplayer2.upstream.TransferListener;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java
rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipher.java
diff --git a/library/core/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java b/library/common/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
similarity index 100%
rename from library/core/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java
rename to library/common/src/test/java/com/google/android/exoplayer2/upstream/crypto/AesFlushingCipherTest.java