[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 am: 7901d97acf -s ours am: ddff415d0f -s ours
am skip reason: subject contains skip directive

Change-Id: I1753afc42ddc472ed9d3714eee25b12537e325e0