diff --git a/library/common/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
index 1966f76a83..4e5b9f2b8e 100644
--- a/library/common/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,6 +19,8 @@ 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/common/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
index 633b54fb20..98ec914fa0 100644
--- a/library/common/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,6 +21,9 @@ 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/google3/third_party/java_src/android_libs/media/github/package-info-exoplayer-upstream-crypto.java b/library/common/src/main/java/com/google/android/exoplayer2/upstream/crypto/package-info.java
similarity index 100%
rename from google3/third_party/java_src/android_libs/media/github/package-info-exoplayer-upstream-crypto.java
rename to library/common/src/main/java/com/google/android/exoplayer2/upstream/crypto/package-info.java