Merge "Use latest KM AIDL API"

libwvdrmengine/factory_upload_tool/Android.bp

@@ -23,7 +23,6 @@ cc_binary {
         "-Wextra",
     ],
     shared_libs: [
-        "android.hardware.security.keymint-V2-ndk",
         "libbase",
         "libbinder_ndk",
         "libcppbor_external",
@@ -35,6 +34,9 @@ cc_binary {
         "libutils",
         "libcppcose_rkp",
     ],
+    defaults: [
+        "keymint_use_latest_hal_aidl_ndk_shared",
+    ],
     srcs: [
         "service.cpp",
         "src/log.cpp",