[automerger skipped] [DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt am: d81917505e am: 1a86903749 am: 97250fe56e -s ours am: 7f3927ade2 -s ours
am skip reason: subject contains skip directive

Change-Id: Iba3473f97dfb38849716e98a3a367679ccbb3636