Merge "Remove verification of 16k-bit RSA APK signing keys" into main