diff --git a/library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java b/library/common/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java
rename to library/common/src/main/java/com/google/android/exoplayer2/PlaybackParameters.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AudioListener.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/AudioListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AudioListener.java
rename to library/common/src/main/java/com/google/android/exoplayer2/audio/AudioListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java b/library/common/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java
rename to library/common/src/main/java/com/google/android/exoplayer2/audio/AuxEffectInfo.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/device/DeviceListener.java b/library/common/src/main/java/com/google/android/exoplayer2/device/DeviceListener.java
similarity index 87%
rename from library/core/src/main/java/com/google/android/exoplayer2/device/DeviceListener.java
rename to library/common/src/main/java/com/google/android/exoplayer2/device/DeviceListener.java
index 3d35c6ad54..0a5526e44d 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/device/DeviceListener.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/device/DeviceListener.java
@@ -15,9 +15,8 @@
  */
 package com.google.android.exoplayer2.device;
 
-import com.google.android.exoplayer2.Player;
-
-/** A listener for changes of {@link Player.DeviceComponent}. */
+// TODO(b/172315872) change back to @link after player migration to common.
+/** A listener for changes of {@code Player.DeviceComponent}. */
 public interface DeviceListener {
 
   /** Called when the device information changes. */
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataOutput.java b/library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataOutput.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/metadata/MetadataOutput.java
rename to library/common/src/main/java/com/google/android/exoplayer2/metadata/MetadataOutput.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java b/library/common/src/main/java/com/google/android/exoplayer2/text/Cue.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/Cue.java
rename to library/common/src/main/java/com/google/android/exoplayer2/text/Cue.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/TextOutput.java b/library/common/src/main/java/com/google/android/exoplayer2/text/TextOutput.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/TextOutput.java
rename to library/common/src/main/java/com/google/android/exoplayer2/text/TextOutput.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/text/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/text/package-info.java
rename to library/common/src/main/java/com/google/android/exoplayer2/text/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameMetadataListener.java b/library/common/src/main/java/com/google/android/exoplayer2/video/VideoFrameMetadataListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/VideoFrameMetadataListener.java
rename to library/common/src/main/java/com/google/android/exoplayer2/video/VideoFrameMetadataListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/VideoListener.java b/library/common/src/main/java/com/google/android/exoplayer2/video/VideoListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/VideoListener.java
rename to library/common/src/main/java/com/google/android/exoplayer2/video/VideoListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionListener.java b/library/common/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionListener.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionListener.java
rename to library/common/src/main/java/com/google/android/exoplayer2/video/spherical/CameraMotionListener.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/video/spherical/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/video/spherical/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/video/spherical/package-info.java
rename to library/common/src/main/java/com/google/android/exoplayer2/video/spherical/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/StableApiCandidate.java b/library/core/src/main/java/com/google/android/exoplayer2/util/StableApiCandidate.java
deleted file mode 100644
index ff96e02e05..0000000000
--- a/library/core/src/main/java/com/google/android/exoplayer2/util/StableApiCandidate.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2019 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.google.android.exoplayer2.util;
-
-import static java.lang.annotation.ElementType.CONSTRUCTOR;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.ElementType.PACKAGE;
-import static java.lang.annotation.ElementType.TYPE;
-import static java.lang.annotation.RetentionPolicy.CLASS;
-
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Annotation to mark an API as a candidate for being part of a stable subset of the API.
- *
- * <p>Note: this is experimental, and no guarantees are made about the stability of APIs even if
- * they are marked with this annotation.
- */
-@Retention(CLASS)
-@Target({TYPE, METHOD, CONSTRUCTOR, FIELD, PACKAGE})
-public @interface StableApiCandidate {}