diff --git a/common/m2/Android.bp b/common/m2/Android.bp
index f16cca9..3efa1a8 100644
--- a/common/m2/Android.bp
+++ b/common/m2/Android.bp
@@ -68,7 +68,7 @@
     ],
     license_text: [
         "repository/com/google/guava/LICENSE.txt",
-    ]
+    ],
 }
 
 license {
@@ -79,7 +79,7 @@
     ],
     license_text: [
         "repository/com/googlecode/java-diff-utils/diffutils/LICENSE.txt",
-    ]
+    ],
 }
 
 license {
@@ -92,7 +92,7 @@
     ],
     license_text: [
         "repository/javax/annotation/javax.annotation-api/NOTICE",
-    ]
+    ],
 }
 
 license {
@@ -102,8 +102,8 @@
         "SPDX-license-identifier-Apache-2.0",
     ],
     license_text: [
-        "repository/com/google/api/grpc/LICENSE"
-    ]
+        "repository/com/google/api/grpc/LICENSE",
+    ],
 }
 
 license {
@@ -113,8 +113,8 @@
         "SPDX-license-identifier-Apache-2.0",
     ],
     license_text: [
-        "repository/joda-time/joda-time/2.9.1/LICENSE"
-    ]
+        "repository/joda-time/joda-time/2.9.1/LICENSE",
+    ],
 }
 
 license {
@@ -125,8 +125,8 @@
     ],
     license_text: [
         "repository/com/google/auth/google-auth-library-credentials/0.13.0/LICENSE",
-        "repository/com/google/auth/google-auth-library-oauth2-http/0.13.0/LICENSE"
-    ]
+        "repository/com/google/auth/google-auth-library-oauth2-http/0.13.0/LICENSE",
+    ],
 }
 
 license {
@@ -136,8 +136,8 @@
         "SPDX-license-identifier-BSD-3-Clause",
     ],
     license_text: [
-        "repository/com/google/auth/google-auth-library-oauth2-http/1.23.0/LICENSE"
-    ]
+        "repository/com/google/auth/google-auth-library-oauth2-http/1.23.0/LICENSE",
+    ],
 }
 
 license {
@@ -147,8 +147,8 @@
         "SPDX-license-identifier-Apache-2.0",
     ],
     license_text: [
-        "repository/io/grpc/grpc-netty-shaded/1.16.1/LICENSE"
-    ]
+        "repository/io/grpc/grpc-netty-shaded/1.16.1/LICENSE",
+    ],
 }
 
 license {
@@ -158,8 +158,19 @@
         "SPDX-license-identifier-Apache-2.0",
     ],
     license_text: [
-        "repository/io/grpc/grpc-netty-shaded/1.56.0/LICENSE"
-    ]
+        "repository/io/grpc/grpc-netty-shaded/1.56.0/LICENSE",
+    ],
+}
+
+license {
+    name: "m2_checker_qual_jar_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-MIT",
+    ],
+    license_text: [
+        "repository/org/checkerframework/LICENSE",
+    ],
 }
 
 license {
@@ -169,8 +180,8 @@
         "SPDX-license-identifier-LGPL-2.1",
     ],
     license_text: [
-        "repository/net/java/dev/jna/jna/3.4.0/LICENSE"
-    ]
+        "repository/net/java/dev/jna/jna/3.4.0/LICENSE",
+    ],
 }
 
 license {
@@ -180,8 +191,8 @@
         "SPDX-license-identifier-Apache-2.0",
     ],
     license_text: [
-        "repository/com/google/turbine/LICENSE"
-    ]
+        "repository/com/google/turbine/LICENSE",
+    ],
 }
 
 java_import {
@@ -191,8 +202,10 @@
 
 java_import {
     name: "byte-buddy-prebuilt-jar",
-    jars: ["repository/net/bytebuddy/byte-buddy/1.12.16/byte-buddy-1.12.16.jar",
-            "repository/net/bytebuddy/byte-buddy-agent/1.12.16/byte-buddy-agent-1.12.16.jar"],
+    jars: [
+        "repository/net/bytebuddy/byte-buddy/1.12.16/byte-buddy-1.12.16.jar",
+        "repository/net/bytebuddy/byte-buddy-agent/1.12.16/byte-buddy-agent-1.12.16.jar",
+    ],
     sdk_version: "current",
 }
 
@@ -201,7 +214,7 @@
     jars: ["repository/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0.jar"],
     sdk_version: "current",
     host_supported: true,
-    licenses: ["m2_java_diff_license"]
+    licenses: ["m2_java_diff_license"],
 }
 
 java_import_host {
@@ -252,7 +265,7 @@
         "//apex_available:platform",
         "//apex_available:anyapex",
     ],
-    licenses: ["m2_guava_license"]
+    licenses: ["m2_guava_license"],
 }
 
 java_import {
@@ -277,7 +290,7 @@
     name: "rxjava",
     jars: [
         "repository/io/reactivex/rxjava2/rxjava/2.2.9/rxjava-2.2.9.jar",
-        "repository/org/reactivestreams/reactive-streams/1.0.2/reactive-streams-1.0.2.jar"
+        "repository/org/reactivestreams/reactive-streams/1.0.2/reactive-streams-1.0.2.jar",
     ],
     sdk_version: "current",
     host_supported: true,
@@ -293,7 +306,7 @@
     host_supported: true,
     jars: ["repository/io/grpc/grpc-netty-shaded/1.16.1/grpc-netty-shaded-1.16.1.jar"],
     visibility: ["//external/grpc-grpc-java/netty/shaded"],
-    licenses: ["m2_grpc_netty_shaded_1.16.1_license"]
+    licenses: ["m2_grpc_netty_shaded_1.16.1_license"],
 }
 
 java_import {
@@ -317,7 +330,7 @@
 java_import_host {
     name: "jna-prebuilt",
     jars: ["repository/net/java/dev/jna/jna/3.4.0/jna-3.4.0.jar"],
-    licenses: ["m2_jna_3.4.0_license"]
+    licenses: ["m2_jna_3.4.0_license"],
 }
 
 java_import_host {
@@ -355,14 +368,14 @@
     ],
     license_text: [
         "repository/com/github/ajalt/clikt/LICENSE.txt",
-    ]
+    ],
 }
 
 java_import {
     name: "metalava-tools-common-m2-deps",
     host_supported: true,
     jars: [
-	"repository/com/github/ajalt/clikt/clikt-jvm/3.5.3/clikt-jvm-3.5.3.jar",
+        "repository/com/github/ajalt/clikt/clikt-jvm/3.5.3/clikt-jvm-3.5.3.jar",
         "repository/com/google/guava/guava/32.1.1-jre/guava-32.1.1-jre.jar",
         "repository/com/google/turbine/0.2.1/turbine-0.2.1.jar",
         "repository/javax/xml/bind/jaxb-api/2.2.12-b140109.1041/jaxb-api-2.2.12-b140109.1041.jar",
@@ -373,35 +386,35 @@
     licenses: [
         "m2_clikt_license",
         "m2_guava_license",
-        "m2_turbine_license"
+        "m2_turbine_license",
     ],
 }
 
 java_import {
-  name: "dokka-tools-common-m2-deps",
-  host_supported: true,
-  jars: [
-    "repository/com/intellij/core-analysis/intellij-core-analysis.jar",
-    "repository/org/jetbrains/kotlin/kotlin-compiler/1.3.61-release-180/kotlin-compiler-1.3.61-release-180.jar",
-    "repository/com/squareup/okhttp4/okhttp/4.0.0/okhttp-4.0.0-RC1.jar",
-    "repository/com/sampullara/cli/1.1.2/cli-parser-1.1.2.jar",
-    "repository/ru/yole/jkid/jkid-8fc7f12e1a.jar",
-    "repository/com/google/inject/guice/3.0/guice-3.0.jar",
-    "repository/org/jetbrains/markdown/0.1.41/markdown-0.1.41.jar",
-    "repository/org/jsoup/jsoup/1.8.3/jsoup-1.8.3.jar",
-    "repository/kotlinx/html/jvm/0.6.8/kotlinx-html-jvm-0.6.8-google.jar",
-    "repository/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar",
-    "repository/org/jetbrains/kotlin/kotlin-script-runtime/1.3.61-release-180/kotlin-script-runtime-1.3.61-release-180-sources.jar",
-    "repository/org/jetbrains/kotlin/kotlin-reflect/1.3.61-release-180/kotlin-reflect-1.3.61-release-180.jar",
-    "repository/org/jetbrains/kotlin/kotlin-plugin-ij193/1.3.61-release-180/kotlin-plugin-ij193-1.3.61-release-180.jar",
-  ],
+    name: "dokka-tools-common-m2-deps",
+    host_supported: true,
+    jars: [
+        "repository/com/intellij/core-analysis/intellij-core-analysis.jar",
+        "repository/org/jetbrains/kotlin/kotlin-compiler/1.3.61-release-180/kotlin-compiler-1.3.61-release-180.jar",
+        "repository/com/squareup/okhttp4/okhttp/4.0.0/okhttp-4.0.0-RC1.jar",
+        "repository/com/sampullara/cli/1.1.2/cli-parser-1.1.2.jar",
+        "repository/ru/yole/jkid/jkid-8fc7f12e1a.jar",
+        "repository/com/google/inject/guice/3.0/guice-3.0.jar",
+        "repository/org/jetbrains/markdown/0.1.41/markdown-0.1.41.jar",
+        "repository/org/jsoup/jsoup/1.8.3/jsoup-1.8.3.jar",
+        "repository/kotlinx/html/jvm/0.6.8/kotlinx-html-jvm-0.6.8-google.jar",
+        "repository/org/jetbrains/intellij/deps/trove4j/1.0.20181211/trove4j-1.0.20181211.jar",
+        "repository/org/jetbrains/kotlin/kotlin-script-runtime/1.3.61-release-180/kotlin-script-runtime-1.3.61-release-180-sources.jar",
+        "repository/org/jetbrains/kotlin/kotlin-reflect/1.3.61-release-180/kotlin-reflect-1.3.61-release-180.jar",
+        "repository/org/jetbrains/kotlin/kotlin-plugin-ij193/1.3.61-release-180/kotlin-plugin-ij193-1.3.61-release-180.jar",
+    ],
 }
 
 java_import {
-  name: "wire-runtime-prebuilt-jar",
-  jars: [
-    "repository/com/squareup/wire/wire-runtime-jvm/4.7.0/wire-runtime-jvm-4.7.0.jar",
-  ],
+    name: "wire-runtime-prebuilt-jar",
+    jars: [
+        "repository/com/squareup/wire/wire-runtime-jvm/4.7.0/wire-runtime-jvm-4.7.0.jar",
+    ],
 }
 
 java_library_static {
@@ -505,6 +518,7 @@
     name: "checker-qual",
     jars: ["repository/org/checkerframework/checker-qual/2.8.1/checker-qual-2.8.1.jar"],
     host_supported: true,
+    licenses: ["m2_checker_qual_jar_license"],
 }
 
 java_import_host {
@@ -608,4 +622,5 @@
             enabled: true,
         },
     },
+    licenses: ["m2_javax_annotation_license"],
 }