Merge "Add missing test dependencies for ApkVerityTest"