Merge "Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged" into stage-aosp-master
diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index f4799f0..1143e05 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -102,6 +102,9 @@
         "net-tests-utils-host-device-common",
         "net-utils-device-common",
     ],
+    kotlincflags: [
+        "-XXLanguage:-GenerateJvmOverloadsAsFinal"
+    ]
 }
 
 filegroup {