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

Change-Id: I4f4d205c0f8d1fc2b3a4d18a6096e01b349f5592