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

Change-Id: I701eb716f1d4fd6b92a8a695c42ccd3c6645b0c9