Merge "Add javax.crypto.Mac as a supported CryptoObject to Fingerprint"