One more place to accept the deprecated x-pkcs7-* subtypes.

Bug: 12970