Merge "testPocCVE_2016_0811: Convert ICrypto to hidl"