diff --git a/current/Android.bp b/current/Android.bp
index 529455d..d0eccdd 100644
--- a/current/Android.bp
+++ b/current/Android.bp
@@ -35,7 +35,7 @@
 
 module_prebuilt_bootclasspath_fragment {
     name: "com.android.permission-bootclasspath-fragment",
-    prefer: true,
+    prefer: false,
     soong_config_variables: {
         module_build_from_source: {
             prefer: false,
@@ -76,6 +76,7 @@
         stub_srcs: ["sdk_library/public/framework-permission.srcjar"],
         current_api: "sdk_library/public/framework-permission.txt",
         removed_api: "sdk_library/public/framework-permission-removed.txt",
+        annotations: "sdk_library/public/framework-permission_annotations.zip",
         sdk_version: "module_current",
     },
     system: {
@@ -83,6 +84,7 @@
         stub_srcs: ["sdk_library/system/framework-permission.srcjar"],
         current_api: "sdk_library/system/framework-permission.txt",
         removed_api: "sdk_library/system/framework-permission-removed.txt",
+        annotations: "sdk_library/system/framework-permission_annotations.zip",
         sdk_version: "module_current",
     },
     module_lib: {
@@ -90,13 +92,14 @@
         stub_srcs: ["sdk_library/module-lib/framework-permission.srcjar"],
         current_api: "sdk_library/module-lib/framework-permission.txt",
         removed_api: "sdk_library/module-lib/framework-permission-removed.txt",
+        annotations: "sdk_library/module-lib/framework-permission_annotations.zip",
         sdk_version: "module_current",
     },
 }
 
 module_java_sdk_library_import {
     name: "framework-permission",
-    prefer: true,
+    prefer: false,
     soong_config_variables: {
         module_build_from_source: {
             prefer: false,
@@ -118,6 +121,7 @@
         stub_srcs: ["sdk_library/public/framework-permission.srcjar"],
         current_api: "sdk_library/public/framework-permission.txt",
         removed_api: "sdk_library/public/framework-permission-removed.txt",
+        annotations: "sdk_library/public/framework-permission_annotations.zip",
         sdk_version: "module_current",
     },
     system: {
@@ -125,6 +129,7 @@
         stub_srcs: ["sdk_library/system/framework-permission.srcjar"],
         current_api: "sdk_library/system/framework-permission.txt",
         removed_api: "sdk_library/system/framework-permission-removed.txt",
+        annotations: "sdk_library/system/framework-permission_annotations.zip",
         sdk_version: "module_current",
     },
     module_lib: {
@@ -132,6 +137,7 @@
         stub_srcs: ["sdk_library/module-lib/framework-permission.srcjar"],
         current_api: "sdk_library/module-lib/framework-permission.txt",
         removed_api: "sdk_library/module-lib/framework-permission-removed.txt",
+        annotations: "sdk_library/module-lib/framework-permission_annotations.zip",
         sdk_version: "module_current",
     },
 }
@@ -156,6 +162,7 @@
         stub_srcs: ["sdk_library/public/framework-permission-s.srcjar"],
         current_api: "sdk_library/public/framework-permission-s.txt",
         removed_api: "sdk_library/public/framework-permission-s-removed.txt",
+        annotations: "sdk_library/public/framework-permission-s_annotations.zip",
         sdk_version: "module_current",
     },
     system: {
@@ -163,6 +170,7 @@
         stub_srcs: ["sdk_library/system/framework-permission-s.srcjar"],
         current_api: "sdk_library/system/framework-permission-s.txt",
         removed_api: "sdk_library/system/framework-permission-s-removed.txt",
+        annotations: "sdk_library/system/framework-permission-s_annotations.zip",
         sdk_version: "module_current",
     },
     module_lib: {
@@ -170,13 +178,14 @@
         stub_srcs: ["sdk_library/module-lib/framework-permission-s.srcjar"],
         current_api: "sdk_library/module-lib/framework-permission-s.txt",
         removed_api: "sdk_library/module-lib/framework-permission-s-removed.txt",
+        annotations: "sdk_library/module-lib/framework-permission-s_annotations.zip",
         sdk_version: "module_current",
     },
 }
 
 module_java_sdk_library_import {
     name: "framework-permission-s",
-    prefer: true,
+    prefer: false,
     soong_config_variables: {
         module_build_from_source: {
             prefer: false,
@@ -199,6 +208,7 @@
         stub_srcs: ["sdk_library/public/framework-permission-s.srcjar"],
         current_api: "sdk_library/public/framework-permission-s.txt",
         removed_api: "sdk_library/public/framework-permission-s-removed.txt",
+        annotations: "sdk_library/public/framework-permission-s_annotations.zip",
         sdk_version: "module_current",
     },
     system: {
@@ -206,6 +216,7 @@
         stub_srcs: ["sdk_library/system/framework-permission-s.srcjar"],
         current_api: "sdk_library/system/framework-permission-s.txt",
         removed_api: "sdk_library/system/framework-permission-s-removed.txt",
+        annotations: "sdk_library/system/framework-permission-s_annotations.zip",
         sdk_version: "module_current",
     },
     module_lib: {
@@ -213,6 +224,7 @@
         stub_srcs: ["sdk_library/module-lib/framework-permission-s.srcjar"],
         current_api: "sdk_library/module-lib/framework-permission-s.txt",
         removed_api: "sdk_library/module-lib/framework-permission-s-removed.txt",
+        annotations: "sdk_library/module-lib/framework-permission-s_annotations.zip",
         sdk_version: "module_current",
     },
 }
@@ -232,6 +244,7 @@
         stub_srcs: ["sdk_library/public/service-permission.srcjar"],
         current_api: "sdk_library/public/service-permission.txt",
         removed_api: "sdk_library/public/service-permission-removed.txt",
+        annotations: "sdk_library/public/service-permission_annotations.zip",
         sdk_version: "module_current",
     },
     system_server: {
@@ -239,13 +252,14 @@
         stub_srcs: ["sdk_library/system-server/service-permission.srcjar"],
         current_api: "sdk_library/system-server/service-permission.txt",
         removed_api: "sdk_library/system-server/service-permission-removed.txt",
+        annotations: "sdk_library/system-server/service-permission_annotations.zip",
         sdk_version: "system_server_current",
     },
 }
 
 module_java_sdk_library_import {
     name: "service-permission",
-    prefer: true,
+    prefer: false,
     soong_config_variables: {
         module_build_from_source: {
             prefer: false,
@@ -263,6 +277,7 @@
         stub_srcs: ["sdk_library/public/service-permission.srcjar"],
         current_api: "sdk_library/public/service-permission.txt",
         removed_api: "sdk_library/public/service-permission-removed.txt",
+        annotations: "sdk_library/public/service-permission_annotations.zip",
         sdk_version: "module_current",
     },
     system_server: {
@@ -270,6 +285,7 @@
         stub_srcs: ["sdk_library/system-server/service-permission.srcjar"],
         current_api: "sdk_library/system-server/service-permission.txt",
         removed_api: "sdk_library/system-server/service-permission-removed.txt",
+        annotations: "sdk_library/system-server/service-permission_annotations.zip",
         sdk_version: "system_server_current",
     },
 }
diff --git a/current/sdk_library/module-lib/framework-permission-s_annotations.zip b/current/sdk_library/module-lib/framework-permission-s_annotations.zip
new file mode 100644
index 0000000..67539e6
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-permission-s_annotations.zip
Binary files differ
diff --git a/current/sdk_library/module-lib/framework-permission_annotations.zip b/current/sdk_library/module-lib/framework-permission_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/module-lib/framework-permission_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/framework-permission-s_annotations.zip b/current/sdk_library/public/framework-permission-s_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/public/framework-permission-s_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/framework-permission_annotations.zip b/current/sdk_library/public/framework-permission_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/public/framework-permission_annotations.zip
Binary files differ
diff --git a/current/sdk_library/public/service-permission_annotations.zip b/current/sdk_library/public/service-permission_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/public/service-permission_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system-server/service-permission_annotations.zip b/current/sdk_library/system-server/service-permission_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/system-server/service-permission_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/framework-permission-s_annotations.zip b/current/sdk_library/system/framework-permission-s_annotations.zip
new file mode 100644
index 0000000..0de31d8
--- /dev/null
+++ b/current/sdk_library/system/framework-permission-s_annotations.zip
Binary files differ
diff --git a/current/sdk_library/system/framework-permission_annotations.zip b/current/sdk_library/system/framework-permission_annotations.zip
new file mode 100644
index 0000000..15cb0ec
--- /dev/null
+++ b/current/sdk_library/system/framework-permission_annotations.zip
Binary files differ