Merge "Fix heap buffer overflow in clearkey CryptoPlugin::decrypt"