Merge "clearkey hidl CryptoPlugin: misc & security fixes" into qt-dev am: e0ed98533c am: 893d1ccbc4 am: 5d27374deb
am: 20b5df68cb

Change-Id: Idc302ae4563bfff5db80db6afeba0c2d0a0cf9fe