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

Change-Id: Ic332eaed415a10d43332a2bd25cb7cbbade7b6ac