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

Change-Id: I7f78dcd5b3f32918b0d0ea40e9bb933a4adb2f7e