diff --git a/Android.bp b/Android.bp
index a34330832c4d0..34b21d663dd67 100644
--- a/Android.bp
+++ b/Android.bp
@@ -411,7 +411,6 @@ java_library {
         "core/java/com/android/internal/util/AsyncChannel.java",
         "core/java/com/android/internal/util/AsyncService.java",
         "core/java/com/android/internal/util/Protocol.java",
-        "core/java/com/android/internal/util/Preconditions.java",
         "telephony/java/android/telephony/Annotation.java",
         ":net-utils-framework-wifi-common-srcs",
     ],
diff --git a/core/java/Android.bp b/core/java/Android.bp
index 675cea8272165..949ba6ac419aa 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -386,10 +386,7 @@ filegroup {
         "android/util/Rational.java",
         "com/android/internal/util/FastXmlSerializer.java",
         "com/android/internal/util/HexDump.java",
-        "com/android/internal/util/IState.java",
         "com/android/internal/util/MessageUtils.java",
-        "com/android/internal/util/State.java",
-        "com/android/internal/util/StateMachine.java",
         "com/android/internal/util/WakeupMessage.java",
     ],
     visibility: [