Merge changes Ie098a1e9,Iaff910f0

* changes:
  mv apkverity apkdmverity
  apkdmverity: use data_model crate for better handling of C structs