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

Change-Id: Icf5ce88a4b654bf3b6886e70069b5725fb946510