Merge "Add support for APK Signature Scheme V3.1"