diff --git a/core/api/module-lib-current.txt b/core/api/module-lib-current.txt
index 781385c455d52..6409dd9433830 100644
--- a/core/api/module-lib-current.txt
+++ b/core/api/module-lib-current.txt
@@ -42,14 +42,6 @@ package android.content.rollback {
 
 }
 
-package android.graphics {
-
-  public final class Compatibility {
-    method public static void setTargetSdkVersion(int);
-  }
-
-}
-
 package android.media {
 
   public class AudioManager {
diff --git a/graphics/java/android/graphics/Compatibility.java b/graphics/java/android/graphics/Compatibility.java
index ed849127aedcf..747fbf111b4b7 100644
--- a/graphics/java/android/graphics/Compatibility.java
+++ b/graphics/java/android/graphics/Compatibility.java
@@ -16,14 +16,11 @@
 
 package android.graphics;
 
-import android.annotation.SystemApi;
-
 /**
  * Helper class for graphics classes to retrieve the targetSdkVersion, as
  * specified by the app.
  * @hide
  */
-@SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
 public final class Compatibility {
     private Compatibility() {}
 
@@ -34,7 +31,6 @@ public final class Compatibility {
      * application. No other code should call this.
      * @hide
      */
-    @SystemApi(client = SystemApi.Client.MODULE_LIBRARIES)
     public static void setTargetSdkVersion(int targetSdkVersion) {
         sTargetSdkVersion = targetSdkVersion;
         Canvas.setCompatibilityVersion(targetSdkVersion);