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

Change-Id: I95e55e4e81fc8d5a6aa06d5ab25299d06194ca17