diff --git a/Android.bp b/Android.bp
index 0681e93..f7933b3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -133,7 +133,6 @@
     rtti: true,
     cppflags: ["-fexceptions"],
 
-    clang: true,
     sanitize: {
         misc_undefined: [
             "unsigned-integer-overflow",
@@ -142,7 +141,7 @@
     },
 }
 
-cc_library{
+cc_library {
     name: "libdng_sdk",
     host_supported: true,
     vendor_available: true,
@@ -156,7 +155,7 @@
     ],
 
     target: {
-        linux_glibc: {
+        host_linux: {
             static_libs: ["libcompiler_rt-extras"],
         },
         darwin: {
diff --git a/METADATA b/METADATA
index 3814b8d..92c927f 100644
--- a/METADATA
+++ b/METADATA
@@ -2,5 +2,6 @@
 #     CONSULT THE OWNERS AND opensource-licensing@google.com BEFORE
 #     DEPENDING ON IT IN YOUR PROJECT. ***
 third_party {
+  license_note: "Adobe's DNG SDK License Agreement"
   license_type: BY_EXCEPTION_ONLY
 }
diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index 26e2fa6..e3dcecf 100644
--- a/fuzzer/Android.bp
+++ b/fuzzer/Android.bp
@@ -36,4 +36,7 @@
         "seeds/CVE_2020_9589/original.dng",
         "seeds/CVE_2020_9589/poc.dng",
     ],
+    fuzz_config: {
+       cc: ["android-security-assurance-redteam@google.com"],
+    },
 }
diff --git a/source/dng_safe_arithmetic.h b/source/dng_safe_arithmetic.h
index b229dc4..66c5ebf 100644
--- a/source/dng_safe_arithmetic.h
+++ b/source/dng_safe_arithmetic.h
@@ -20,6 +20,7 @@
 #ifndef __dng_safe_arithmetic__
 #define __dng_safe_arithmetic__
 
+#include <climits>
 #include <cstddef>
 #include <cstdint>
 #include <limits>
@@ -112,7 +113,7 @@
 #if __has_builtin(__builtin_smull_overflow)
 inline std::int64_t SafeInt64MultByClang(std::int64_t arg1, std::int64_t arg2) {
   std::int64_t result;
-#if (__WORDSIZE == 64) && !defined(__APPLE__)
+#if LONG_MAX == INT64_MAX
   if (__builtin_smull_overflow(arg1, arg2, &result)) {
 #else
   if (__builtin_smulll_overflow(arg1, arg2, &result)) {