diff --git a/Android.bp b/Android.bp
index b0a1f93acd975..287f271be3849 100644
--- a/Android.bp
+++ b/Android.bp
@@ -298,6 +298,7 @@ java_defaults {
         "contacts-provider-platform-compat-config",
     ],
     libs: [
+        "androidx.annotation_annotation",
         "app-compat-annotations",
         "ext",
         "framework-updatable-stubs-module_libs_api",
diff --git a/libs/protoutil/Android.bp b/libs/protoutil/Android.bp
index 132d71eb6db8c..128be3c33ac56 100644
--- a/libs/protoutil/Android.bp
+++ b/libs/protoutil/Android.bp
@@ -55,6 +55,7 @@ cc_library {
 
     export_include_dirs: ["include"],
 
+    min_sdk_version: "30",
     apex_available: [
         "//apex_available:platform",
         "com.android.os.statsd",
@@ -81,5 +82,5 @@ cc_test {
 
     proto: {
         type: "full",
-    }
+    },
 }