diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorInterface.java b/library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorInterface.java
similarity index 86%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorInterface.java
rename to library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorInterface.java
index 93ea7ca6fd..abd4b32480 100644
--- a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorInterface.java
+++ b/library/common/src/main/java/com/google/android/exoplayer2/trackselection/TrackSelectorInterface.java
@@ -15,10 +15,9 @@
  */
 package com.google.android.exoplayer2.trackselection;
 
-import com.google.android.exoplayer2.Player;
-
+// TODO(b/172315872) Replace @code by @link when Player has been migrated to common
 /**
- * The component of a {@link Player} responsible for selecting tracks to be played.
+ * The component of a {@code Player} responsible for selecting tracks to be played.
  *
  * <p>No Player agnostic track selection is currently supported. Clients should downcast to the
  * implementation's track selection.
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/trackselection/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/trackselection/package-info.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/trackselection/package-info.java
rename to library/common/src/main/java/com/google/android/exoplayer2/trackselection/package-info.java
diff --git a/library/core/src/main/java/com/google/android/exoplayer2/util/MutableFlags.java b/library/common/src/main/java/com/google/android/exoplayer2/util/MutableFlags.java
similarity index 100%
rename from library/core/src/main/java/com/google/android/exoplayer2/util/MutableFlags.java
rename to library/common/src/main/java/com/google/android/exoplayer2/util/MutableFlags.java