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

Change-Id: I21c8fb82cb7e9aee0442c791702eea92e44e4d3c