[automerger skipped] Merge "[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt" into pi-dev am: d651cdcfaf -s ours
am skip reason: subject contains skip directive

Change-Id: Ieedde35228fba4fa4b882bb1de8e8b092e71b459