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

Change-Id: Ia105b6a0b0461d85d86b3e5f6c312e87ff251c6e