Merge "Rename ApkVerityTests to ApkVerityTest for consistency"