diff --git a/library/core/build.gradle b/library/core/build.gradle
index 98dd2929e7..bebd62beb9 100644
--- a/library/core/build.gradle
+++ b/library/core/build.gradle
@@ -39,7 +39,6 @@ dependencies {
     api project(modulePrefix + 'library-extractor')
     implementation 'androidx.annotation:annotation:' + androidxAnnotationVersion
     compileOnly 'com.google.code.findbugs:jsr305:' + jsr305Version
-    compileOnly 'com.google.errorprone:error_prone_annotations:' + errorProneVersion
     compileOnly 'org.checkerframework:checker-qual:' + checkerframeworkVersion
     compileOnly 'org.checkerframework:checker-compat-qual:' + checkerframeworkCompatVersion
     compileOnly 'org.jetbrains.kotlin:kotlin-annotations-jvm:' + kotlinAnnotationsVersion
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
index ddb41d352e..c9dd336be6 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/ExoPlayer.java
@@ -54,7 +54,6 @@ import com.google.android.exoplayer2.video.MediaCodecVideoRenderer;
 import com.google.android.exoplayer2.video.VideoFrameMetadataListener;
 import com.google.android.exoplayer2.video.VideoSize;
 import com.google.android.exoplayer2.video.spherical.CameraMotionListener;
-import com.google.errorprone.annotations.InlineMe;
 import java.util.List;
 
 /**
@@ -839,13 +838,12 @@ public interface ExoPlayer extends Player {
     }
 
     /**
-     * Builds a {@link SimpleExoPlayer} instance.
+     * Builds a {@link Player} instance.
      *
      * @throws IllegalStateException If this method or {@link #buildExoPlayer()} has already been
      *     called.
      */
-    @InlineMe(replacement = "this.buildExoPlayer()")
-    public SimpleExoPlayer build() {
+    public Player build() {
       return buildExoPlayer();
     }