[automerger skipped] Merge "[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt" into pi-dev am: d651cdcfaf -s ours am: a67cf12a10 am: 6e733b0f50

Change-Id: I96ed0d83960007129375f869d97ea3196fc2cb5f