[automerger skipped] Merge "[DO NOT MERGE] Fix heap buffer overflow in clearkey CryptoPlugin::decrypt" into qt-qpr1-dev am: ac8a248341 am: 71e573c46d -s ours am: 4200bec0b0 -s ours
am skip reason: subject contains skip directive

Change-Id: I68651c8a8c3679fe81b7e4facf29962cb32fa7e8