Merge "apkdmverity: dm-verity over apk"