[automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in clearkey...

[automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt am: d8191750 am: 1a869037 am: 97250fe5 -s ours am: 7f3927ad -s ours
am skip reason: subject contains skip directive

Change-Id: Iba3473f97dfb38849716e98a3a367679ccbb3636