Merge "APK Signature Scheme v3: add version number to proof-of-rotation."