Merge "Migrate Cellbroadcast modules to use modules-utils"
diff --git a/core/java/Android.bp b/core/java/Android.bp
index 949ba6a..3b2d883 100644
--- a/core/java/Android.bp
+++ b/core/java/Android.bp
@@ -332,12 +332,7 @@
 filegroup {
     name: "framework-cellbroadcast-shared-srcs",
     srcs: [
-        "android/os/HandlerExecutor.java",
         "android/util/LocalLog.java",
-        "com/android/internal/util/IState.java",
-        "com/android/internal/util/Preconditions.java",
-        "com/android/internal/util/State.java",
-        "com/android/internal/util/StateMachine.java",
     ],
 }