Merge \\\"APK Signature Scheme v2 APK verifier.\\\" am: 4f8bde47ae am: 9cf15a318b
am: 42c4f541ae

Change-Id: I52e329faa4c8290d4da6cfc5a48d261cda13b184