Merge "[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt" into qt-dev am: 5b4757c2bb

Change-Id: I0a4c6c46e49781974dd60855c567f5a518767d01