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

Change-Id: Ia724c508988dab6e5253b32f4c8384ccdd4ad90e