diff --git a/Android.bp b/Android.bp
index ccd437c..d50d33e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,8 +12,30 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+package {
+    default_applicable_licenses: ["external_libgav1_license"],
+}
+
+// Added automatically by a large-scale-change
+// See: http://go/android-license-faq
+license {
+    name: "external_libgav1_license",
+    visibility: [":__subpackages__"],
+    license_kinds: [
+        "SPDX-license-identifier-Apache-2.0",
+    ],
+    license_text: [
+        "libgav1/LICENSE",
+    ],
+}
+
+bug_component_id = 324837
+
+fuzz_email_cc = ["jzern@google.com"]
+
 cc_library_static {
     name: "libgav1",
+    host_supported: true,
     vendor_available: true,
 
     export_include_dirs: [
@@ -23,6 +45,7 @@
 
     cflags: [
         "-DLIBGAV1_MAX_BITDEPTH=10",
+        "-DLIBGAV1_THREADPOOL_USE_STD_MUTEX",
         "-O2",
         "-Wall",
         "-Werror",
@@ -161,3 +184,61 @@
     },
     min_sdk_version: "29",
 }
+
+cc_defaults {
+    name: "libgav1_fuzzer_defaults",
+    host_supported: true,
+    native_coverage: true,
+
+    cflags: [
+        "-DLIBGAV1_MAX_BITDEPTH=10",
+        "-DLIBGAV1_THREADPOOL_USE_STD_MUTEX",
+    ],
+
+    local_include_dirs: [
+        "libgav1",
+    ],
+
+    srcs: [
+        "libgav1/examples/file_reader.cc",
+        "libgav1/examples/file_reader_constants.cc",
+        "libgav1/examples/file_reader_factory.cc",
+        "libgav1/examples/ivf_parser.cc",
+    ],
+
+    static_libs: [
+        "libgav1",
+    ],
+
+    fuzz_config: {
+        cc: fuzz_email_cc,
+        componentid: bug_component_id,
+    },
+}
+
+cc_fuzz {
+    name: "libgav1_decoder_fuzzer",
+    defaults: ["libgav1_fuzzer_defaults"],
+
+    srcs: [
+        "libgav1/tests/fuzzer/decoder_fuzzer.cc",
+    ],
+}
+
+cc_fuzz {
+    name: "libgav1_decoder_fuzzer_frame_parallel",
+    defaults: ["libgav1_fuzzer_defaults"],
+
+    srcs: [
+        "libgav1/tests/fuzzer/decoder_fuzzer_frame_parallel.cc",
+    ],
+}
+
+cc_fuzz {
+    name: "libgav1_obu_parser_fuzzer",
+    defaults: ["libgav1_fuzzer_defaults"],
+
+    srcs: [
+        "libgav1/tests/fuzzer/obu_parser_fuzzer.cc",
+    ],
+}
diff --git a/NOTICE b/NOTICE
deleted file mode 120000
index 7a694c9..0000000
--- a/NOTICE
+++ /dev/null
@@ -1 +0,0 @@
-LICENSE
\ No newline at end of file
diff --git a/OWNERS b/OWNERS
index 12a7048..00d455d 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,2 +1,4 @@
+# for external/libgav1
+include platform/frameworks/av:/media/janitors/codec_OWNERS
 jzern@google.com
 vigneshv@google.com