vts_ibase_test: static libhidl-gen-utils am: 490212445a am: 874cb413a5 am: 65a75cd06f

Original change: https://android-review.googlesource.com/c/platform/system/libhidl/+/2454995

Change-Id: Ie7263c269985c23e050d1c7c84be8284cbed359b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/Android.bp b/Android.bp
index 670ee39..b694886 100644
--- a/Android.bp
+++ b/Android.bp
@@ -112,9 +112,6 @@
     ],
     min_sdk_version: "29",
     afdo: true,
-    header_abi_checker: {
-        diff_flags: ["-allow-adding-removing-weak-symbols"],
-    },
 }
 
 // WARNING: deprecated
diff --git a/vintfdata/manifest.xml b/vintfdata/manifest.xml
index b3d84aa..b93205c 100644
--- a/vintfdata/manifest.xml
+++ b/vintfdata/manifest.xml
@@ -54,7 +54,7 @@
             <instance>default</instance>
         </interface>
     </hal>
-    <hal format="hidl">
+    <hal format="hidl" max-level="7">
         <name>android.system.wifi.keystore</name>
         <transport>hwbinder</transport>
         <version>1.0</version>