[apkverify] Merge idsig into apkverify package

This CL merges idsig into apkverify package as apkverify is
supposed to cover apk signature verification v3 and v4.

Bug: 248999133
Test: libapkverify.test apkdmverity.test microdroid_manager_test
Change-Id: Ieef2dcf93496164f8bb72cd4ee819ebb822f6142
diff --git a/apkdmverity/Android.bp b/apkdmverity/Android.bp
index 51ef4dd..4346089 100644
--- a/apkdmverity/Android.bp
+++ b/apkdmverity/Android.bp
@@ -10,10 +10,10 @@
     prefer_rlib: true,
     rustlibs: [
         "libanyhow",
+        "libapkverify",
         "libbitflags",
         "libclap",
         "libdata_model",
-        "libidsig",
         "libitertools",
         "liblibc",
         "libnix",
diff --git a/apkdmverity/src/main.rs b/apkdmverity/src/main.rs
index b99ed1c..bce25e8 100644
--- a/apkdmverity/src/main.rs
+++ b/apkdmverity/src/main.rs
@@ -26,8 +26,8 @@
 mod util;
 
 use anyhow::{bail, Context, Result};
+use apkverify::{HashAlgorithm, V4Signature};
 use clap::{App, Arg};
-use idsig::{HashAlgorithm, V4Signature};
 use itertools::Itertools;
 use std::fmt::Debug;
 use std::fs;