Merge "ApkSignatureVerifier refactor."