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

Change-Id: I24ac9e67a85797a86210e5d889200ecb7035fd01